Fix for Bug NMS-5985