more ugly hacks