Fix how mapper is applied