Fix mapper. p.96