mapping fixing