Fixed problem with BS