Hopefully fix server crash