Attachments fix + 2.5 fix