End point fully handle properly.
Edit updated in order to handle end points.