more ugly hacks, yay