fix logic GCP-5807