Fix the dependency problem