diff --git a/LuaRules/Gadgets/unit_cyclops_range_fix.lua b/LuaRules/Gadgets/unit_cyclops_range_fix.lua
new file mode 100644
index 0000000000..63f1e3b920
--- /dev/null
+++ b/LuaRules/Gadgets/unit_cyclops_range_fix.lua
@@ -0,0 +1,69 @@
+function gadget:GetInfo()
+    return {
+        name    = "Cyclops attack move fixing",
+        desc    = "Makes Cyclops move closer when it can't hit with canon",
+        author  = "dyth68",
+        date    = "2022-05-12",
+        license = "Public Domain",
+        layer   = 83,
+        enabled = true
+    }
+end
+
+local cyclopsi = {}
+local cyclopsDefIDs = {}
+local spGetUnitWeaponTestRange = Spring.GetUnitWeaponTestRange
+local spGetUnitWeaponTarget    = Spring.GetUnitWeaponTarget
+local spGiveOrderToUnit        = Spring.GiveOrderToUnit
+local spGetUnitPosition        = Spring.GetUnitPosition
+local spGetTeamUnitsByDefs     = Spring.GetTeamUnitsByDefs
+local spEcho                     = Spring.Echo
+local spGetUnitCommands        = Spring.GetUnitCommands
+
+function gadget:GameFrame(frame)
+	for cyclopsId, _ in pairs(cyclopsi) do
+		local _, _, canontargetID = spGetUnitWeaponTarget (cyclopsId, 1)
+		local targetType, _, slowBeamTargetID = spGetUnitWeaponTarget (cyclopsId, 2)
+		if (targetType == 1) and (canontargetID == nil) then
+			--spEcho("Retargetting Cyclops")
+			local x, y, z = spGetUnitPosition(cyclopsId)
+			local tx, ty, tz = spGetUnitPosition(slowBeamTargetID)
+			local nx, nz = x * 0.95 + tx * 0.05, z * 0.95 + tz * 0.05
+			local ny = math.max(0, Spring.GetGroundHeight(nx, nz))
+			-- Remove the inching command if it's already there
+			local cmds = spGetUnitCommands(cyclopsId, 1)
+			if #cmds > 0 then
+				local cmd1 = cmds[1]
+				if cmd1 and cmd1.options.internal then
+					spGiveOrderToUnit(cyclopsId, CMD.REMOVE, {1, cmd1.tag}, {"ctrl"})
+				end
+			end
+			spGiveOrderToUnit(cyclopsId, CMD.INSERT, {0, CMD.MOVE, CMD.OPT_INTERNAL, nx, ny, nz}, CMD.OPT_ALT)
+		end
+	end
+end
+
+function gadget:UnitCreated(unitID, unitDefID, teamId)
+	if cyclopsDefIDs[unitDefID] then
+		cyclopsi[unitID] = true
+	end
+end
+
+function gadget:UnitDestroyed(unitID, unitDefID, teamId)
+	if cyclopsDefIDs[unitDefID] then
+		cyclopsi[unitID] = nil
+	end
+end
+
+function gadget:Initialize()
+	for udid, unitDef in pairs(UnitDefs) do
+		if unitDef.customParams.inch_forwards_for_cannon_range then
+			cyclopsDefIDs[udid] = true
+			for _,teamID in ipairs(Spring.GetTeamList()) do
+				for _, unitID in ipairs(spGetTeamUnitsByDefs(teamID, udid)) do
+					cyclopsi[unitID] = true
+				end
+			end
+		end
+	end
+end
diff --git a/units/tankheavyassault.lua b/units/tankheavyassault.lua
index 424dbc0940..f0987d6f66 100644
--- a/units/tankheavyassault.lua
+++ b/units/tankheavyassault.lua
@@ -20,6 +20,7 @@ return { tankheavyassault = {
     outline_x = 110,
     outline_y = 110,
     outline_yoff = 13.5,
+	inch_forwards_for_cannon_range = true,
   },
 
   explodeAs           = [[BIG_UNIT]],