NBIA-739 Fix