fixed server AND client crash