Fixing Issue #4