Removed use of  in finding endpoint