NBIA-737 and NBIA-738 Fix