Fix bootstrap glitch