fix more bs