NBIA-732 and NBIA-751 Fix