Final fix for the routing issues