Fix bootstraping code