Fix for Bug NMS-6081