Fix bug on initial route