GCP-6082 Fix