Dev branch NVG fix

Thanks @JoSchaap