GCP-7125 quick fix