NVVG fix 2