Bug fix causing xva deleting when we don't want it.