Fix server crash