GCM batch fix