Fixing one-time use of startpoints.