diff --git a/engine/class_modules/apl/apl_hunter.cpp b/engine/class_modules/apl/apl_hunter.cpp
index 5ee963db730..d929c97ffa0 100644
--- a/engine/class_modules/apl/apl_hunter.cpp
+++ b/engine/class_modules/apl/apl_hunter.cpp
@@ -366,14 +366,14 @@ void marksmanship_ptr( player_t* p )
   drst->add_action( "explosive_shot,target_if=min:dot.explosive_shot.remains,if=set_bonus.mid2_4pc&active_enemies>1&!fight_style.dungeonroute&(!talent.tactical_reload|!buff.lock_and_load.up)" );
   drst->add_action( "explosive_shot,if=(!talent.tactical_reload|!buff.lock_and_load.up)&(!cooldown.rapid_fire.ready|!fight_style.dungeonroute)", "In DRoute, prioritize Rapid Fire over Explosive Shot to maximize the RF CDR from Explo." );
   drst->add_action( "volley" );
-  drst->add_action( "aimed_shot,if=buff.trueshot.up&buff.precise_shots.down&cooldown.black_arrow.ready|full_recharge_time<gcd+cast_time" );
   drst->add_action( "trueshot,if=variable.trueshot_ready" );
+  drst->add_action( "aimed_shot,if=buff.trueshot.up&buff.precise_shots.down&cooldown.black_arrow.ready|full_recharge_time<gcd+cast_time" );
+  drst->add_action( "black_arrow" );
   drst->add_action( "rapid_fire" );
-  drst->add_action( "wailing_arrow" );
+  drst->add_action( "wailing_arrow,if=(buff.precise_shots.up|!cooldown.aimed_shot.ready|buff.wailing_arrow.remains<gcd)" );
   drst->add_action( "multishot,target_if=max:debuff.spotters_mark.down,if=buff.precise_shots.up&active_enemies>1&talent.aspect_of_the_hydra&(!fight_style.dungeonroute|active_enemies>2)", "Multi-Shot as a PS spender on 2T with Hydra talented. In DRoute, do it on 3 or more targets." );
   drst->add_action( "arcane_shot,if=buff.precise_shots.up" );
   drst->add_action( "aimed_shot" );
-  drst->add_action( "black_arrow" );
   drst->add_action( "steady_shot" );
 
   draoe->add_action( "explosive_shot,target_if=min:dot.explosive_shot.remains,if=set_bonus.mid2_4pc&!fight_style.dungeonroute&(!talent.tactical_reload|!buff.lock_and_load.up)" );
diff --git a/engine/class_modules/apl/hunter/mm_ptr.txt b/engine/class_modules/apl/hunter/mm_ptr.txt
index 666ed645da3..362f4b82f00 100644
--- a/engine/class_modules/apl/hunter/mm_ptr.txt
+++ b/engine/class_modules/apl/hunter/mm_ptr.txt
@@ -33,15 +33,15 @@ actions.drst+=/explosive_shot,target_if=min:dot.explosive_shot.remains,if=set_bo
 # In DRoute, prioritize Rapid Fire over Explosive Shot to maximize the RF CDR from Explo.
 actions.drst+=/explosive_shot,if=(!talent.tactical_reload|!buff.lock_and_load.up)&(!cooldown.rapid_fire.ready|!fight_style.dungeonroute)
 actions.drst+=/volley
-actions.drst+=/aimed_shot,if=buff.trueshot.up&buff.precise_shots.down&cooldown.black_arrow.ready|full_recharge_time<gcd+cast_time
 actions.drst+=/trueshot,if=variable.trueshot_ready
+actions.drst+=/aimed_shot,if=buff.trueshot.up&buff.precise_shots.down&cooldown.black_arrow.ready|full_recharge_time<gcd+cast_time
+actions.drst+=/black_arrow
 actions.drst+=/rapid_fire
-actions.drst+=/wailing_arrow
+actions.drst+=/wailing_arrow,if=(buff.precise_shots.up|!cooldown.aimed_shot.ready|buff.wailing_arrow.remains<gcd)
 # Multi-Shot as a PS spender on 2T with Hydra talented. In DRoute, do it on 3 or more targets.
 actions.drst+=/multishot,target_if=max:debuff.spotters_mark.down,if=buff.precise_shots.up&active_enemies>1&talent.aspect_of_the_hydra&(!fight_style.dungeonroute|active_enemies>2)
 actions.drst+=/arcane_shot,if=buff.precise_shots.up
 actions.drst+=/aimed_shot
-actions.drst+=/black_arrow
 actions.drst+=/steady_shot
 
 actions.draoe=explosive_shot,target_if=min:dot.explosive_shot.remains,if=set_bonus.mid2_4pc&!fight_style.dungeonroute&(!talent.tactical_reload|!buff.lock_and_load.up)