Fixed server crashing