GCP-6232 minor fix