Fix import problem in the case of duplicate attachments
Work around upstream video import problem