Updated: Really add NMS for 1.6.4?