Fix for enhancement NMS-5466