Fix server's ending up with different routing id's