Fix CallHistory Mapper