Correct endpoint self detection