Fixed handler paths