VE-742 Attempt to fix VE usage logic