Fixing Issue #2