-- fixed attachments related bug