Fixing Issue #44