hammer bug fix