attempt to fix server-side crash bug