Fix attachment adding
Merge branch 'hotfix/broken-attachments'