Adds workaround for multi-server setups