Fixing Issue #48