Fixed bug on legacy routes