Fix SMS Mapper