Fixing problem with attachments.