Fix bug in bootstrap