Fix build-order dependency