Fixed handler look-up defect