Fix for Bug NMS-5714