nms-6023/6127 fix