Extended the fix for issue #109 and added a test.