Fix to mapper.tt for 2.01.0