fixed dependency mapping