Dispatch fix