fixing some bullshit