More preDispatch() fixing