NBIA-745 Fix