diff --git a/MiniScript-cs/MiniscriptTAC.cs b/MiniScript-cs/MiniscriptTAC.cs
index 300c1b2..cc4c274 100644
--- a/MiniScript-cs/MiniscriptTAC.cs
+++ b/MiniScript-cs/MiniscriptTAC.cs
@@ -623,7 +623,7 @@ public void SetTemp(int tempNum, Value value) {
 			}
 
 			public Value GetTemp(int tempNum) {
-				return temps == null ? null : temps[tempNum];
+				return temps == null || temps.Count <= tempNum ? null : temps[tempNum];
 			}
 
 			public Value GetTemp(int tempNum, Value defaultValue) {
@@ -992,6 +992,7 @@ public void ManuallyPushCall(ValFunction func, Value resultStorage=null, List<Va
 				Value self = null;	// "self" is always null for a manually pushed call
 				
 				Context nextContext = context.NextCallContext(func.function, argCount, self != null, null);
+				nextContext.outerVars = func.outerVars;
 				if (self != null) nextContext.self = self;
 				nextContext.resultStorage = resultStorage;
 				stack.Push(nextContext);				
diff --git a/MiniScript-cs/MiniscriptTypes.cs b/MiniScript-cs/MiniscriptTypes.cs
index 4de18cf..d77c824 100644
--- a/MiniScript-cs/MiniscriptTypes.cs
+++ b/MiniScript-cs/MiniscriptTypes.cs
@@ -1037,7 +1037,7 @@ public ValFunction(Function function) {
 		}
 		public ValFunction(Function function, ValMap outerVars) {
 			this.function = function;
-            this.outerVars = outerVars;
+            		this.outerVars = outerVars;
 		}
 
 		public override string ToString(TAC.Machine vm) {
@@ -1065,9 +1065,9 @@ public override double Equality(Value rhs) {
 			return function == other.function ? 1 : 0;
 		}
 
-        public ValFunction BindAndCopy(ValMap contextVariables) {
-            return new ValFunction(function, contextVariables);
-        }
+	        public virtual ValFunction BindAndCopy(ValMap contextVariables) {
+	        	return new ValFunction(function, contextVariables);
+	        }
 
 	}