#BS-8 in progress

#BS-8 fixed