Fix for Bug NMS-6060