fix bug GCP-6077