Fix for issue #84
Fix for issue #84