fix build order, take 4