fixing bs bug