Fixed the dependecy problem