Bugfix/#1150

Fixes #1150