Fixing Issue #50