Fix for Bug NMS-5948