Fix for Bug NMS-6077