attachments fixes