Another fix for KeyValueBuffer.