NBIA-793, 795, 796 Fix