Fixed last_endpoints