Fix build-order