Fix args to dispatch