Fix encryption subkey tracking