Fix bug with Router