Fix handler name