Fixed routes issue