Fixing Issue #7