diff --git a/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt b/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt
index a71bb152a1a..ecff48d1b29 100644
--- a/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt
+++ b/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt
@@ -2,10 +2,14 @@ Name:Kytheon, Hero of Akros
 ManaCost:W
 Types:Legendary Creature Human Soldier
 PT:2/1
-T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | IsPresent$ Card.attackedThisCombat+Self | IsPresent2$ Creature.Other+attackedThisCombat | PresentCompare2$ GE2 | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At end of combat, if CARDNAME and at least two other creatures attacked this combat, exile CARDNAME, then return him to the battlefield transformed under his owner's control.
+T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | CheckSVar$ CanFlip | SVarCompare$ GE3 | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At end of combat, if CARDNAME and at least two other creatures attacked this combat, exile CARDNAME, then return him to the battlefield transformed under his owner's control.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | WithCounters$ LOYALTY_3 | ForgetOtherRemembered$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+# Fix for Kytheon except for Manifested corner case
+T:Mode$ Attacks | ValidCard$ Card.YouCtrl | Execute$ KytheonReset | Static$ True
+SVar:KytheonReset:DB$ StoreSVar | SVar$ CanFlip | Type$ Number | Expression$ 0 | SubAbility$ KytheonsFriends
+SVar:KytheonsFriends:DB$ StoreSVar | SVar$ CanFlip | Type$ Count | Expression$ Valid Card.attackedThisCombat | IsPresent$ Card.attackedThisCombat+Self
 A:AB$ Pump | Cost$ 2 W | Defined$ Self | KW$ Indestructible | SpellDescription$ CARDNAME gains indestructible until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kytheon_hero_of_akros.jpg
 AlternateMode:DoubleFaced
@@ -25,5 +29,4 @@ A:AB$ Animate | Cost$ AddCounter<0/LOYALTY> | Defined$ Self | Power$ 4 | Toughne
 SVar:DBPrevent:DB$ Pump | Defined$ Self | KW$ HIDDEN Prevent all damage that would be dealt to CARDNAME.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gideon_battle_forged.jpg
-Oracle:[+2] Up to one target creature an opponent controls attacks Gideon, Battle-Forged during its controller's next turn if able.\n[+1] Until your next turn, target creature gains indestructible. Untap that creature.\n[0] Until end of turn, Gideon, Battle-Forged becomes a 4/4 Human Soldier creature with indestructible that's still a planeswalker. Prevent all damage that would be dealt to him this turn.
-
+Oracle:[+2] Up to one target creature an opponent controls attacks Gideon, Battle-Forged during its controller's next turn if able.\n[+1] Until your next turn, target creature gains indestructible. Untap that creature.\n[0] Until end of turn, Gideon, Battle-Forged becomes a 4/4 Human Soldier creature with indestructible that's still a planeswalker. Prevent all damage that would be dealt to him this turn.
\ No newline at end of file