Added condition to check for deleted fields.