hack dependency build order a bit