Fixes attachment methods

Fixes bug where attachments are attached / embedded twice