fixed bug for multiple servers