Issue fix for attachments