Proposed fix for Issue #1

See code and included tests for this issue