fixed NBIA-694,NBIA-696,NBIA-698,NBIA-701