Fixing Issue #8