Bug fix from the unset bootstrap.