Fixed issue with attachments