Fixed server side crash