Reproduce issue #247 (cause is #252); yeyy
Fixes issue #247 and #252; yeyy; Is this too dirty?
Merge branch 'bugfix/issue247' into develop