fixes #59 with some bootstrap hacks