Re #6516 Make sure output data is saved properly