Fixed bug with Y button