--- a/integration/js/mashupcore.js	Thu Jan 17 17:21:51 2013 +0100
+++ b/integration/js/mashupcore.js	Tue Jan 29 17:26:56 2013 +0100
@@ -309,7 +309,6 @@
             videourl = IriSP.video_url_transform(media.video);
         }
         var videoid = "video_" + media.id,
-            videoEl = $('<video>'),
             width = $(".video").width(),
             height = $(".video").height(),
             mp4_file = videourl.replace(/\.webm$/i,'.mp4'),
@@ -469,7 +468,9 @@
             if (media === currentMedia) {
                 seekdiv.hide();
             }
-            mashup.checkLoaded();
+            if (mashup === currentMedia && media === mashup.currentMedia) {
+                changeCurrentAnnotation();
+            }
         });
         
         media.on("play", function() {
@@ -664,9 +665,6 @@
                 seekdiv.show();
             }
         }
-        if (currentMedia.elementType === "mashup") {
-            mashup.checkLoaded();
-        }
         $(".Ldt-Ctrl-Time-Total").text(currentMedia.duration.toString());
         currentMedia.trigger("timeupdate",currentMedia.getCurrentTime());
         currentMedia.trigger("pause");