Workaround for saving the data object correctly.