* Patch for GCM issue 21