Fix for Bug NMS-6024