Fixing Issue #3