Fix handler params