Fixed CVR not saving.