Fixed issue with gcm