One more CV tweak