fix Endpoint Mapping