Hotfix #4

Fixed server hang