diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs
index 7e3774805f..1526c88cda 100644
--- a/OpenRA.Mods.RA/AttackBase.cs
+++ b/OpenRA.Mods.RA/AttackBase.cs
@@ -115,7 +115,7 @@ namespace OpenRA.Mods.RA
 				a();
 		}
 
-		public void DoAttack(Actor self, Target target)
+		public virtual void DoAttack(Actor self, Target target)
 		{
 			if( !CanAttack( self, target ) ) return;
 
diff --git a/OpenRA.Mods.RA/AttackLeap.cs b/OpenRA.Mods.RA/AttackLeap.cs
index 3eeeac80ea..f2bb17a750 100644
--- a/OpenRA.Mods.RA/AttackLeap.cs
+++ b/OpenRA.Mods.RA/AttackLeap.cs
@@ -14,25 +14,22 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	class AttackLeapInfo : AttackBaseInfo
+	class AttackLeapInfo : AttackFrontalInfo
 	{
-		public override object Create(ActorInitializer init) { return new AttackLeap(init.self); }
+		public override object Create(ActorInitializer init) { return new AttackLeap(init.self, this); }
 	}
 
-	class AttackLeap : AttackBase
+	class AttackLeap : AttackFrontal
 	{
 		internal bool IsLeaping;
 		protected Target target;
 
-		public AttackLeap(Actor self)
-			: base(self) {}
+		public AttackLeap(Actor self, AttackLeapInfo info)
+			: base(self, info) {}
 
-		public override void Tick(Actor self)
+		public override void DoAttack(Actor self, Target target)
 		{
-			base.Tick(self);
-
-			if (!target.IsValid) return;
-			if (IsLeaping) return;
+			if( !CanAttack( self, target ) ) return;
 
 			var weapon = Weapons[0].Info;
 			if( !Combat.IsInRange( self.CenterLocation, weapon.Range, target ) ) return;