Improved bootstrap. see
https://github.com/twanwv/HUSACCT/commit/90a5994bfc361cc91f124ed574b93a574848590b
for more details.