NMS bug fixed