bullshit hack fixes