Temporary fix for server crash
Trying to fix server crash