Add check to avoid empty fields, third edition.