Fixed cleanup handler call