fix for NBIA-681