Fix endpoint allocation