Fixing the routes