fix and Mappers add