Fix handler call