fix more bullshit