Safe nms regen - one more try

Looks like this time it is working properly