Mapper fixed to support incompete objects