BugFix for crashing server