*Fix reach location not saving

*Fix infinite stage loop (occurs when 2 or more stage are exactly the
same)