diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp
index cda23704a..15f48f88e 100644
--- a/apps/variable_box_controller.cpp
+++ b/apps/variable_box_controller.cpp
@@ -151,12 +151,12 @@ void VariableBoxController::ContentViewController::willDisplayCellForIndex(Highl
     /* TODO: implement list contexts */
     // TODO: handle matrix and scalar!
     LayoutRef layoutR = layoutRefForIndex(index);
-    const Matrix * matrixEvaluation = static_cast<const Matrix *>(evaluation);
+    const Matrix matrixEvaluation = Matrix(static_cast<const MatrixNode *>(evaluation.node()));
     myCell->setLayoutRef(layoutR);
     char buffer[2*PrintFloat::bufferSizeForFloatsWithPrecision(2)+1];
-    int numberOfChars = PrintFloat::convertFloatToText<float>(matrixEvaluation->numberOfRows(), buffer, PrintFloat::bufferSizeForFloatsWithPrecision(2), 2, Preferences::PrintFloatMode::Decimal);
+    int numberOfChars = PrintFloat::convertFloatToText<float>(matrixEvaluation.numberOfRows(), buffer, PrintFloat::bufferSizeForFloatsWithPrecision(2), 2, Preferences::PrintFloatMode::Decimal);
     buffer[numberOfChars++] = 'x';
-    PrintFloat::convertFloatToText<float>(matrixEvaluation->numberOfColumns(), buffer+numberOfChars, PrintFloat::bufferSizeForFloatsWithPrecision(2), 2, Preferences::PrintFloatMode::Decimal);
+    PrintFloat::convertFloatToText<float>(matrixEvaluation.numberOfColumns(), buffer+numberOfChars, PrintFloat::bufferSizeForFloatsWithPrecision(2), 2, Preferences::PrintFloatMode::Decimal);
     myCell->setSubtitle(buffer);
   } else {
     myCell->setLayoutRef(LayoutRef(nullptr));