fixed bug on server change