Fix incorrect handler