More fix for NMS