Index: TZTesterSp/tangentz/TZTester.java
==================================================================
--- TZTesterSp/tangentz/TZTester.java
+++ TZTesterSp/tangentz/TZTester.java
@@ -273,15 +273,17 @@
 	{
 		// <<modified by cafelier>> : named parameters
 		String Name = (Index==-1 ? "_" : m_Problem.getParamNames()[Index]);
 
 		String Desc = ParamType.getBaseName();
+		if (Desc.equals("long") || Desc.equals("Long"))
+			Desc = "long long";
 
 		if (ParamType.getDimension() == 0)
 		{
 			// Just a scalar value, simply initialize it at declaration (long integers need an 'L' tagged on)
-			if (Desc.equals("long") || Desc.equals("Long"))
+			if (Desc.equals("long long"))
 				Code.append(ParamType.getDescriptor(m_Language) + " " + Name + " = " + Input + "LL; ");
 			else
 				Code.append(ParamType.getDescriptor(m_Language) + " " + Name + " = " + Input + "; ");
 		}
 		else
@@ -292,11 +294,13 @@
 				Code.append(ParamType.getDescriptor(m_Language) + " " + Name + "; ");
 			  }
 			  else
 			  {
 				// Arrays need to be converted to vector<type> before passing
-				Code.append(ParamType.getBaseName().toLowerCase() + " " + Name + "_[] = " + Input + ";\n\t");
+				if (Desc.equals("long long"))
+					Input = Input.replaceAll("¥¥d+","$1LL");
+				Code.append(Desc.toLowerCase() + " " + Name + "_[] = " + Input + ";\n\t");
 				Code.append("  "+ParamType.getDescriptor(m_Language) + " " + Name + "(" + Name + "_, " + Name + "_+sizeof("+Name+"_)/sizeof(*"+Name+"_)); ");
 			  }
 		}
 	}
 }