Fixed saving of empty elements