Fix #15 for dumping.