Re: Make dumping more robust