Fix for Bug NMS-4056