diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs
index 33c017f23..9bb2c9d44 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs
@@ -46,7 +46,7 @@ namespace Barotrauma
 		public bool HasSources { get => sources.Count > 0; }
 
 		private enum SourceCategory { Shared, Server, Client };
-		private Regex rMaskPathValid = new Regex(@"^[^/]+/[^/]+/csharp(/(shared|client|server))?(/[^/]+)+\.cs$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+		private Regex rMaskPathValid = new Regex(@"^(((?!csharp)[^/])+/)+csharp(/(shared|client|server))?(/[^/]+)+\.cs$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 		private Regex rMaskPathCategory1 = new Regex(@"/(shared|client|server)(/[^/]+)+\.cs$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 		private Regex rMaskPathCategory2 = new Regex(@"^/(shared|client|server)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 		private void RunFolder(string folder)
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsUtility.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsUtility.cs
index 10e01c4f0..ee0cbfa0a 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsUtility.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsUtility.cs
@@ -432,6 +432,7 @@ namespace Barotrauma
 			foreach (var elem in typesElem.Elements())
             {
 				var type = Type.GetType(elem.Value);
+				if (type == null && GameMain.LuaCs?.CsScriptLoader?.Assembly != null) type = GameMain.LuaCs.CsScriptLoader.Assembly.GetType(elem.Value);
 				if (type == null) throw new Exception($"Type {elem.Value} not found.");
 				result.Add(type);