fixed dependency mess