Bootstrap compatibility

Fixes #61