fixed: Mapper resolve function