Fix Bootstrap error
Fix Bootstrap error
Fix Bootstrap error
Merge pull request #2261 from dennishendriksen/master

Fix Bootstrap errors