Fixing Issue #264