Fixed bootstrap integration