Add fix for follow up on NMS-2793