Fix a bug, better handling of update-data.