Fix saving of comments