Fix for Bug NMS-5747