potential fix for NMS-5922