fixed a bug on server side
fixed a bug on server side