bug fix server crash