Server hang bug
- Fixed server hang bug