fix for GCP-7618 issue