fixed NBIA-684