Fixed handler issue