#315: The return of NVK