Fixing Issue #9