Router state bugfix