PLF-5387: Fix Night Vision path