Custom handler call

see #398

(sorry for the mess)