fix mapper issue