Fixed bug that happened from routing changes