Fixed Issue #264