Fix arg ordering