Fixing Issue #77