diff --git a/src/bcf/bcf/bcfxml.py b/src/bcf/bcf/bcfxml.py
index bc4eaadee0..c0791f98fd 100644
--- a/src/bcf/bcf/bcfxml.py
+++ b/src/bcf/bcf/bcfxml.py
@@ -476,8 +476,8 @@ class BcfXml:
         if viewpoint.snapshot:
             topic_filepath = os.path.join(self.filepath, topic.guid)
             filepath = os.path.join(topic_filepath, viewpoint.snapshot)
-            if not os.path.exists(filepath) or topic_filepath not in filepath:
-                filename = viewpoint.guid + "." + viewpoint.snapshot[-3:]
+            if not os.path.exists(filepath):
+                filename = viewpoint.guid + os.path.splitext(viewpoint.snapshot)[-1]
                 copyfile(viewpoint.snapshot, os.path.join(topic_filepath, filename))
                 viewpoint.snapshot = filename
         topic.viewpoints[viewpoint.guid] = viewpoint