fixed NBIA-681