fixed bug for server hang?