Fix handler mapping