Unbreak the "dispatch" command