server, fixed bug