Fix bootstrap