GCP-6385 fix order