Fix for Bug NMS-5838