Fix for routing table breaking bug