Bootstrap fix, closes #1051.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Fixed tickets |  #1051
| License       | MIT