Endpoints fix