fixed dependency handling