Fix for Bug NMS-5752