Fix -m 5000 performance on NV after change to new standard