Tests & Fix for Issue #225

Attached are a few tests showing the scenario described in Issue #225 and a possible fix.