MARI-69 fixed gcm feature