Fixing Issue #1