fix for GCP-8191