gcm bug fix 1