fix ordering on bootstrap upgrade