diff --git a/card/standard.js b/card/standard.js
index 6b12b3293..4c562bd25 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -1411,7 +1411,7 @@ card.standard={
 			direct:true,
 			audio:true,
 			filter:function(event,player){
-				return player.countCards('he')>2;
+				return player.countCards('he')>2&&event.target.isAlive();
 			},
 			content:function(){
 				"step 0"
diff --git a/character/old.js b/character/old.js
index 2b1d43073..66d268724 100644
--- a/character/old.js
+++ b/character/old.js
@@ -243,7 +243,7 @@ character.old={
                 return false;
             },
             filter:function(event,player){
-                return event.card.name=='sha'&&(get.color(event.card)=='red'||event.player.hasSkill('jiu'));
+                return event.card&&event.card.name=='sha'&&(get.color(event.card)=='red'||event.player.hasSkill('jiu'));
             },
             content:function(){
                 player.loseMaxHp();
diff --git a/game/game.js b/game/game.js
index cd5eae9d9..2f75e288e 100644
--- a/game/game.js
+++ b/game/game.js
@@ -31125,6 +31125,14 @@
                         var node=ui.create.div('.menubutton.large','获取扩展',start.firstChild,clickMode);
 						node.link=page;
 						node.mode='get';
+						page.listen(function(){
+							if(!page.currenttimeout){
+								var active=page.querySelector('.videonode.current');
+								if(active){
+									active.classList.remove('current');
+								}
+							}
+						});
                         var importextensionexpanded=false;
                         page.style.paddingBottom='10px';
                         var importExtension;
@@ -31188,12 +31196,14 @@
 
                         var clickExtension=function(){
                             var active=this.parentNode.querySelector('.videonode.current');
-                            if(active){
+                            if(active&&active!=this){
                                 active.classList.remove('current');
                             }
-                            if(active!=this){
-                                this.classList.add('current');
-                            }
+                            this.classList.add('current');
+							clearTimeout(page.currenttimeout);
+							page.currenttimeout=setTimeout(function(){
+								delete page.currenttimeout;
+							},200);
                         };
                         var downloadExtension=function(e){
                             if((this.innerHTML!='下载扩展'&&this.innerHTML!='更新扩展')||!window.JSZip) return;
diff --git a/game/update.js b/game/update.js
index de79643c2..62ce6ca9f 100644
--- a/game/update.js
+++ b/game/update.js
@@ -17,6 +17,7 @@ window.noname_update={
         // 'character/*',
         'character/hearth.js',
         'character/gwent.js',
+        'character/old.js',
         // 'mode/boss.js',
         // 'mode/versus.js',
         // 'mode/guozhan.js',