Re-fix dispatch.