Fix the dep order