Dispatcher, dispatch fix