GCP-8476 additional fix