Solved the dependency problem