Fixed bootstrap problem