Fixing Issue #74