Fixed loading of dependencies