Fix for GHKM derivation.