diff --git a/src/apps/deskcalc/ExpressionTextView.cpp b/src/apps/deskcalc/ExpressionTextView.cpp
index 61f4f412d1..d3f986048a 100644
--- a/src/apps/deskcalc/ExpressionTextView.cpp
+++ b/src/apps/deskcalc/ExpressionTextView.cpp
@@ -26,7 +26,9 @@ ExpressionTextView::ExpressionTextView(BRect frame, CalcView* calcView)
 					B_FOLLOW_NONE, B_WILL_DRAW),
 	  fCalcView(calcView),
 	  fKeypadLabels(""),
-	  fPreviousExpressions(20)
+	  fPreviousExpressions(20),
+	  fHistoryPos(0),
+	  fCurrentExpression("")
 {
 	SetFont(be_bold_font);
 //	SetAlignment(B_ALIGN_RIGHT);
diff --git a/src/apps/deskcalc/ExpressionTextView.h b/src/apps/deskcalc/ExpressionTextView.h
index 6cd02b3782..0ded2a96b8 100644
Binary files a/src/apps/deskcalc/ExpressionTextView.h and b/src/apps/deskcalc/ExpressionTextView.h differ