Added test for issue #84
Added fix for issue #84