diff --git a/DMCompiler/DM/Builders/DMExpressionBuilder.cs b/DMCompiler/DM/Builders/DMExpressionBuilder.cs
index 95a3a8e5ea..7670aa4674 100644
--- a/DMCompiler/DM/Builders/DMExpressionBuilder.cs
+++ b/DMCompiler/DM/Builders/DMExpressionBuilder.cs
@@ -33,7 +33,7 @@ public static DMExpression BuildExpression(DMASTExpression expression, DMObject
             case DMASTStringFormat stringFormat: return BuildStringFormat(stringFormat, dmObject, proc, inferredPath);
             case DMASTIdentifier identifier: return BuildIdentifier(identifier, dmObject, proc, inferredPath);
             case DMASTScopeIdentifier globalIdentifier: return BuildScopeIdentifier(globalIdentifier, dmObject, proc, inferredPath);
-            case DMASTCallableSelf: return new ProcSelf(expression.Location, inferredPath, proc);
+            case DMASTCallableSelf: return new ProcSelf(expression.Location, null, proc);
             case DMASTCallableSuper: return new ProcSuper(expression.Location, dmObject, proc);
             case DMASTCallableProcIdentifier procIdentifier: return BuildCallableProcIdentifier(procIdentifier, dmObject);
             case DMASTProcCall procCall: return BuildProcCall(procCall, dmObject, proc, inferredPath);
@@ -754,8 +754,9 @@ private static DMExpression BuildDereference(DMASTDereference deref, DMObject dm
 
                 case DMASTDereference.IndexOperation indexOperation:
                     operation = new Dereference.IndexOperation {
-                        // Passing the path here is cursed, but one of the tests seems to suggest we want that?
-                        Index = DMExpression.Create(dmObject, proc, indexOperation.Index, prevPath),
+                        // var/type1/result = new /type2()[new()] changes the inferred new to "new /type1()"
+                        // L[new()] = new() uses the type of L however
+                        Index = DMExpression.Create(dmObject, proc, indexOperation.Index, inferredPath ?? prevPath),
                         Safe = indexOperation.Safe,
                         Path = prevPath
                     };