Fix saving of multiple items