Fix for Bug NMS-6080