Fix bootstrap dependency issue