Fix for defect parsing attachments