NBIA-769 Fix