Added fix for issue #95 with test case