Fix bootstrapping problem.
Merge pull request #2 from ddsc/byrman_fix-bootstrapping-problem

Fix bootstrapping problem.