(Hopefully) fixed an error that caused freezing of clients.