Re-fix GCP-7199