Fixed handler not covered refactor, grrr.