Add check to avoid empty fields, second edition.