Fixed serer-side crash