Fixed attachment handling issue.