Fixed a possible multi-server bug