Fixup the way the dump is created