Fixing GCS issue