Fix for Bug NMS-5693