Handler bug fix