Bootstrap fix, closes #1051.
Merge pull request #1053 from phaidon/bootstrap-fix

Bootstrap fix, closes #1051.