fix order of build tasks