Fix: added a fix so attachments are indexed