Unit test for issue #74
Fix for issue #74