Fixing CNV store config