fixed NBIA#691