Another try at fixing attachments

Let's see if this works...