fix make-handler method
make-handler & wrapper-handler