diff --git a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyser.java b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyser.java
index 55d55e5..78a1e3c 100644
--- a/demos/java/infodynamics/demos/autoanalysis/AutoAnalyser.java
+++ b/demos/java/infodynamics/demos/autoanalysis/AutoAnalyser.java
@@ -958,7 +958,11 @@ public abstract class AutoAnalyser extends JFrame
 			} else {
 				// Construct the calculator:
 				// 1. Java
-				javaCode.append("    " + abstractContinuousClass.getSimpleName() + " calc;\n");
+				// If we wanted to create as superclass:
+				// javaCode.append("    " + abstractContinuousClass.getSimpleName() + " calc;\n");
+				// But that gives problems when we use interfaces such as AnalyticNullDistributionComputer,
+				//  so we'll store it as the instantiated class:
+				javaCode.append("    " + calcContinuous.getClass().getSimpleName() + " calc;\n");
 				javaCode.append(javaConstructorLine);
 				// 2. Python
 				pythonCode.append(pythonPreConstructorLine);