Fix - respect the force-bootstrap attribute