Fix bug with routing
Fix bug with routing