diff --git a/src/battle-phases.ts b/src/battle-phases.ts
index 57dacf54df3..2028a46780b 100644
--- a/src/battle-phases.ts
+++ b/src/battle-phases.ts
@@ -1347,7 +1347,7 @@ class MoveEffectPhase extends PokemonPhase {
     if (hiddenTag && !this.move.getMove().getAttrs(HitsTagAttr).filter(hta => (hta as HitsTagAttr).tagType === hiddenTag.tagType).length)
       return false;
 
-    if (this.getUserPokemon().getTag(BattlerTagType.IGNORE_ACCURACY))
+    if (this.getUserPokemon().getTag(BattlerTagType.IGNORE_ACCURACY) && (this.getUserPokemon().getLastXMoves().find(() => true)?.targets || []).indexOf(target.getBattlerIndex()) > -1)
       return true;
 
     const moveAccuracy = new Utils.NumberHolder(this.move.getMove().accuracy);
diff --git a/src/data/move.ts b/src/data/move.ts
index ab81fe4d39c..728c8632d27 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -1278,7 +1278,7 @@ export class ChargeAttr extends OverrideMoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
     return new Promise(resolve => {
-      const lastMove = user.getLastXMoves(1) as TurnMove[];
+      const lastMove = user.getLastXMoves() as TurnMove[];
       if (!lastMove.length || lastMove[0].move !== move.id || lastMove[0].result !== MoveResult.OTHER) {
         (args[0] as Utils.BooleanHolder).value = true;
         new MoveChargeAnim(this.chargeAnim, move.id, user).play(user.scene, () => {