Fix for crashing server