Fix bootstrapped BY