Fix error introduced by NM value check disable