fix bug makes server crashed
Merge branch 'haosun' of github.com:ludwiksh/Marksimos