Fixed broken mappers