Should properly fix server-side crash