diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 7fa9abf..374e725 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -3509,7 +3509,11 @@ namespace AyaNova.PlugIn.V8
             if (ocf == null) return ret;
             //NOTE: this code inspired by winforApp::Util.cs PrepareCustomFieldsGrid method            
             dynamic d = new JObject();
-            d.formkey = RavenCustomTranslationKeyObjectName;
+            var formCustomKey = RavenCustomTranslationKeyObjectName;
+            if (formCustomKey == "WorkOrderItem")
+                formCustomKey = "WorkOrder";
+
+            d.formkey = formCustomKey;
             dynamic dtemplate = new JArray();
             Guid Creator = Guid.Empty;
             Guid Modifier = Guid.Empty;
@@ -3571,11 +3575,12 @@ namespace AyaNova.PlugIn.V8
             d.template = dtemplate.ToString();
 
             //ok, were here because there *are* custom fields available
-            var a = await util.GetAsync("form-custom/" + RavenCustomTranslationKeyObjectName);
+           
+            var a = await util.GetAsync("form-custom/" + formCustomKey);
             var RavenFormCustomId = util.IdFromResponse(a);
             var ctoken = util.CTokenFromResponse(a);
             d.concurrency = ctoken;
-            await util.PutAsync("form-custom/" + RavenCustomTranslationKeyObjectName, d.ToString());
+            await util.PutAsync("form-custom/" + formCustomKey, d.ToString());
 
             //Event log fixup
             await util.EventLog(util.AyaType.FormCustom, RavenFormCustomId, SafeGetUserMap(Creator), SafeGetUserMap(Modifier), Created, Modified);