Fix problem with committing data_structures assignments