Slightly improved exit point determination