Better check for included attachments