* Fix build order