diff --git a/Download_SDK_Desktop.bat b/Download_SDK_Desktop.bat
index b275bbd..8b269f0 100644
--- a/Download_SDK_Desktop.bat
+++ b/Download_SDK_Desktop.bat
@@ -6,7 +6,7 @@ setlocal
 
 bitsadmin /reset
 bitsadmin /create third_party_download_desktop
-bitsadmin /addfile third_party_download_desktop https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.18.4_Win64_Linux64_Mac64.7z "%~dp0\_PopcornFX_Runtime_SDK_Desktop.7z"
+bitsadmin /addfile third_party_download_desktop https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.18.5_Win64_Linux64_Mac64.7z "%~dp0\_PopcornFX_Runtime_SDK_Desktop.7z"
 bitsadmin /setpriority third_party_download_desktop "FOREGROUND"
 bitsadmin /resume third_party_download_desktop
 
diff --git a/Download_SDK_Mobile.bat b/Download_SDK_Mobile.bat
index 9979c89..f15e719 100644
--- a/Download_SDK_Mobile.bat
+++ b/Download_SDK_Mobile.bat
@@ -6,7 +6,7 @@ setlocal
 
 bitsadmin /reset
 bitsadmin /create third_party_download_mobile
-bitsadmin /addfile third_party_download_mobile https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.18.4_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
+bitsadmin /addfile third_party_download_mobile https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.18.5_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
 bitsadmin /setpriority third_party_download_mobile "FOREGROUND"
 bitsadmin /resume third_party_download_mobile
 
diff --git a/PopcornFX.uplugin b/PopcornFX.uplugin
index b40dabd..ceb6797 100644
--- a/PopcornFX.uplugin
+++ b/PopcornFX.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 21804,
-	"VersionName": "2.18.4",
+	"Version": 21805,
+	"VersionName": "2.18.5",
 	"FriendlyName": "PopcornFX",
 	"Description": "PopcornFX Realtime Particle Solution integration into Unreal Engine",
 	"Category": "PopcornFX",
diff --git a/README.md b/README.md
index 8eabb2f..c2c8b06 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Unreal Engine PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unreal Engine 4** and **Unreal Engine 5** as a Plugin.
-* **Version:** `v2.18.4`
+* **Version:** `v2.18.5`
 * **Unreal Engine:** `4.27`, `5.1`, `5.2` and `5.3`
 * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android`, `PS4`, `PS5`, `XboxOne`, `Xbox Series`, `Switch`
 
diff --git a/Source/PopcornFX/Private/Attributes/PopcornFXAttributeList.cpp b/Source/PopcornFX/Private/Attributes/PopcornFXAttributeList.cpp
index c243a44..0624885 100644
--- a/Source/PopcornFX/Private/Attributes/PopcornFXAttributeList.cpp
+++ b/Source/PopcornFX/Private/Attributes/PopcornFXAttributeList.cpp
@@ -212,6 +212,20 @@ UPopcornFXAttributeSampler		*FPopcornFXSamplerDesc::ResolveAttributeSampler(UPop
 		FObjectPropertyBase		*prop = FindFProperty<FObjectPropertyBase>(parentActor->GetClass(), m_AttributeSamplerComponentProperty);
 		if (prop != null)
 			attrib = Cast<UPopcornFXAttributeSampler>(prop->GetObjectPropertyValue_InContainer(parentActor));
+		else
+		{
+			// If we can't find it in the properties, try and find it in the actor components.
+			TArray<UActorComponent *>	components;
+			parentActor->GetComponents(UPopcornFXAttributeSampler::StaticClass(), components, false);
+			for (UActorComponent	*component : components)
+			{
+				if (component->GetFName() == m_AttributeSamplerComponentProperty)
+				{
+					attrib = Cast<UPopcornFXAttributeSampler>(component);
+					break;
+				}
+			}
+		}
 	}
 	else
 	{
diff --git a/Source/PopcornFX/Public/PopcornFXVersionGenerated.h b/Source/PopcornFX/Public/PopcornFXVersionGenerated.h
index 6db6552..8d18d97 100644
--- a/Source/PopcornFX/Public/PopcornFXVersionGenerated.h
+++ b/Source/PopcornFX/Public/PopcornFXVersionGenerated.h
@@ -7,5 +7,5 @@
 
 #define POPCORNFX_PLUGIN_VERSION_MAJOR 2
 #define POPCORNFX_PLUGIN_VERSION_MINOR 18
-#define POPCORNFX_PLUGIN_VERSION_PATCH 4
+#define POPCORNFX_PLUGIN_VERSION_PATCH 5
 #define POPCORNFX_PLUGIN_VERSION_TAG ""