Fix all orders of arguments