Fix identity mapper