Fix for issue #264