NBIA-805 Fix