Routes fixes#2