Fixed bug with hammer events