fixed build order