Build Ordering Fix