NBIA-740 and NBIA-756 Fix