Bugfix/1068093v2

This needs a test.