Add check to avoid empty fields