Experimental client crash fix