Fix wrong handler used for OnWho