update dispatch to handle flaw in API dispatches