Fixed server-side crash