Fixed bootstrap code