diff --git a/src/main/java/de/prob2/jupyter/commands/TypeCommand.java b/src/main/java/de/prob2/jupyter/commands/TypeCommand.java
index de56ed6a6c9fe09c4385ea6e8365dcae605de06e..07c7e76051acaecc3887f76beb2d47bda6001013 100644
--- a/src/main/java/de/prob2/jupyter/commands/TypeCommand.java
+++ b/src/main/java/de/prob2/jupyter/commands/TypeCommand.java
@@ -68,12 +68,14 @@ public final class TypeCommand implements Command {
 		final ProBKernel kernel = this.kernelProvider.get();
 		final Trace trace = this.animationSelector.getCurrentTrace();
 		final IEvalElement formula = kernel.parseFormula(args.get(FORMULA_PARAM), FormulaExpand.EXPAND);
-		final TypeCheckResult result = trace.getStateSpace().typeCheck(formula);
-		if (result.isOk()) {
-			return new DisplayData(result.getType());
-		} else {
-			throw new ProBError("Type errors in formula", result.getErrors());
-		}
+		return CommandUtils.withSourceCode(formula, () -> {
+			final TypeCheckResult result = trace.getStateSpace().typeCheck(formula);
+			if (result.isOk()) {
+				return new DisplayData(result.getType());
+			} else {
+				throw new ProBError("Type errors in formula", result.getErrors());
+			}
+		});
 	}
 	
 	@Override