fixed messed up handler params