Fixed arguments usage for strict compliance