Fix server side crash