Attempt to fix server crash