Bugfixes
#FIX: Fixed variant of issue 53.
#CHANGE: Modified unit test for this issue to cover both variants.