Mark #853 fixed as I cannot reproduce it anymore

It seems that while working on the related issues I have fixed this bug.
I cannot reproduce it using the examples in the issue, but I may be
missing something still.

Fixes #853