Fix end of route check for circular routes

Fix end of route check for circular routes #123