Routing code fix