diff --git a/src/Overture.lua b/src/Overture.lua
index 612cfbd..6accdd1 100644
--- a/src/Overture.lua
+++ b/src/Overture.lua
@@ -28,7 +28,7 @@ local Libraries: {[string]: ModuleScript} = {}
 	@ignore
 ]=]
 local function Retrieve(InstanceName: string, InstanceClass: string, InstanceParent: Instance, ForceWait: boolean?): Instance
-	if ForceWait and not RunService:IsEdit() then
+	if ForceWait and RunService:IsRunning() then
 		return InstanceParent:WaitForChild(InstanceName)
 	end
 	
@@ -193,7 +193,7 @@ function Overture:Get(InstanceClass: string, InstanceName: string, Parent: Insta
 	
 	if Item then
 		return Item
-	elseif RunService:IsServer() or RunService:IsEdit() then
+	elseif RunService:IsServer() or not RunService:IsRunning() then
 		return Retrieve(InstanceName, InstanceClass, SetFolder)
 	else
 		return SetFolder:WaitForChild(InstanceName)
diff --git a/wally.toml b/wally.toml
index e89eb9c..3e9414d 100644
--- a/wally.toml
+++ b/wally.toml
@@ -1,7 +1,7 @@
 [package]
 name = "devsparkle/overture"
 description = "Source code management engine for Roblox"
-version = "2.2.2"
+version = "2.2.3"
 license = "MIT"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"