Fixing the new dispatcher.