Fix bug where handler name was ignored when adding