Fix for Bug NMS-5975