Fix possible misordering of arguments