Fixed the routing issues