fix some Bullshit