Fix bootstrapping
Merge pull request #1282 from flaviut/devel

Fix bootstrapping