Further GCM fix