Fix bootstrap bug