Fixing the Routes