attempt at fixing server crash