fix build order, take 2