fix disconnect when press start server
Merge branch 'john'