fixes #546 #547

Closed patrick-werner closed 7 months ago