Fix for servercrash