Fixed for revisions, errata and types of attachments