fix Server failures