Route generation fix