more ugly hacking