Functional test that demonstrates issue #61
Unit test that demonstrates issue #61
Fix issue #61