Fix for issue #77

Fix for issue #77