Fix Generic IMapper