WC 5.1 Routing Issue Fix