Get the arg order right