diff --git a/common/scripted_effects/RG_special_effects.txt b/common/scripted_effects/RG_special_effects.txt
index 2ff407b..0461d31 100644
--- a/common/scripted_effects/RG_special_effects.txt
+++ b/common/scripted_effects/RG_special_effects.txt
@@ -130,7 +130,7 @@ rg_create_fake_dragon = {
 			which = rg_fake_dragon_timedlife_counter
 			value = 0
 		}
-		set_global_event_target_as = rg_fake_dragon_owner
+		save_global_event_target_as = rg_fake_dragon_owner
 		create_fleet = {
 			name = "NAME_RG_Nanite_Dragon"
 			settings = {
@@ -156,6 +156,7 @@ rg_create_fake_dragon = {
 				}
 				set_fleet_flag = rg_fake_dragon_fleet
 				assign_leader = last_created_leader
+				save_global_event_target_as = rg_fake_dragon_fleet
 			}
 		}
 	}
diff --git a/events/RG_story_event.txt b/events/RG_story_event.txt
index f18bfa7..32eac72 100644
--- a/events/RG_story_event.txt
+++ b/events/RG_story_event.txt
@@ -673,16 +673,24 @@ event = {
 
 	trigger = {
 		exists = event_target:rg_fake_dragon_owner
-		event_target:rg_fake_dragon_owner = {
-            any_owned_leader = {
-                has_leader_flag = rg_fake_dragon
+        OR = {
+            AND = {
+                NOT  = {
+                    exists = event_target:rg_fake_dragon_fleet
+                }
+                exists = event_target:rg_fake_dragon_admiral 
             }
-            NOT = {
-                any_owned_fleet = {
-                    has_fleet_flag = rg_fake_dragon
+            event_target:rg_fake_dragon_fleet = {
+                leader = {
+                    OR = {
+                        exists = NO
+                        NOT = {
+                            has_leader_flag = rg_fake_dragon
+                        }
+                    }
                 }
             }
-		}
+        }
 	}
 
 	immediate = {