Fix bug with routing