Fixed NBIA-675 and NBIA-674