diff --git a/character/sp.js b/character/sp.js
index dea68d8f1..521bdb11a 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -1098,7 +1098,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						forced:true,
 						charlotte:true,
 						filter:(event,player)=>{
-							return true;
 							var num=player.getStorage('olqifan').length,pos=('jeh').slice(0,num);
 							return num>0&&player.countCards(pos)>0;
 						},
@@ -1123,10 +1122,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					event.result.card=card;
 					player.markAuto('olqifan',[get.type2(card,false)]);
 					var id=get.id();
-					event.getParent().set('olqifan_discard',id);
 					player.when('chooseToUseAfter')
+						.filter((evt)=>evt==event.getParent())
 						.filter(lib.skill.olqifan_discard.filter)
-						.filter((event)=>event.olqifan_discard==id)
 						.then(()=>{
 							event.maxNum=Math.min(3,player.getStorage('olqifan').length);
 							event.num=0;
diff --git a/character/sp2.js b/character/sp2.js
index 623dd000a..a73de5d08 100644
--- a/character/sp2.js
+++ b/character/sp2.js
@@ -2045,7 +2045,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							var target=trigger.target;
 							event.target=target;
 							trigger.targets.remove(target);
-							trigger.triggeredTargets1.remove(target);
+							//trigger.triggeredTargets1.remove(target);
 							trigger.untrigger();
 							game.delayx();
 							'step 1'