Fixing Issue #53