Handling incoming paths better