NBIA-777 Fix