Fixing Issue #21