fixed dependency mappings