adjust for bootstrap rewrite