Safe nms regen - take two