Fixing Issue #20