NBIA-692 Fix