Fixed handler bug