Fixing hkdf