NBIA-723 and NBIA-724 Fix