Fixed #264