Fix build task order