fixed NBIA-691