Dependency Exception fix