Use more robust method for bootstrapping.

See #230.