Fix dispatchToHandler