Fix the endpoints