Another attempt at fixing server nonsense