First attempt to fix route generation