#BS-3 fixed