fixed dependency resolver