fix the normal handler return bug.