Fix bootstraping