working fix for NMS-6221