This patch fixes the endpoint numbers. They were numbered from 1 to n
but that assumption is not correct in all cases.