fix broken changes for NMS-7064