Regg mapper fix