Fix for Bug NMS-5830