gistfile1.diff

--- old/components/tombfix.js
+++ new/components/tombfix.js
@@ -314,13 +314,22 @@
        if(greasemonkey){
            greasemonkey = greasemonkey.getService().wrappedJSObject;
            
-           env.addBefore(greasemonkey, 'evalInSandbox', function(){
-               for(var i=0, len=arguments.length ; i<len ; i++){
-                   var arg = arguments[i];
-                   if(typeof(arg) == 'object'){
-                       arg.GM_Tombloo = GM_Tombloo;
-                       arg.GM_Tombfix = GM_Tombfix;
-                       return;
+            env.addAround(greasemonkey, 'injectScripts', function(func, args){
+               for(var i=0, len=args.length ; i<len ; i++){
+                   var arg = args[i];
+                   if(typeof(arg) == 'object' && 'document' in arg){
+                       arg.wrappedJSObject.GM_Tombloo = GM_Tombloo;
+                       arg.wrappedJSObject.GM_Tombfix = GM_Tombfix;
+                       break;
+                   }
+               }
+               func(args);
+               for(var i=0, len=args.length ; i<len ; i++){
+                   var arg = args[i];
+                   if(typeof(arg) == 'object' && 'document' in arg){
+                       delete arg.wrappedJSObject.GM_Tombloo;
+                       delete arg.wrappedJSObject.GM_Tombfix;
+                       break;
                    }
                }
            });