diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index 5de6fb55b..9572b1d36 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -6,7 +6,7 @@ namespace Calculation {
 
 HistoryController::HistoryController(Responder * parentResponder, CalculationStore * calculationStore) :
   ViewController(parentResponder),
-  m_selectableTableView(SelectableTableView(this, this, 0, 0, 0, 0)),
+  m_selectableTableView(SelectableTableView(this, this)),
   m_calculationStore(calculationStore)
 {
 }
diff --git a/escher/include/escher/selectable_table_view.h b/escher/include/escher/selectable_table_view.h
index 7b7372008..e5285eac4 100644
--- a/escher/include/escher/selectable_table_view.h
+++ b/escher/include/escher/selectable_table_view.h
@@ -14,8 +14,9 @@
 
 class SelectableTableView : public TableView, public Responder {
 public:
-  SelectableTableView(Responder * parentResponder, TableViewDataSource * dataSource, KDCoordinate topMargin, 
-    KDCoordinate rightMargin, KDCoordinate bottomMargin, KDCoordinate leftMargin);
+  SelectableTableView(Responder * parentResponder, TableViewDataSource * dataSource,
+    KDCoordinate topMargin = 0, KDCoordinate rightMargin = 0, KDCoordinate bottomMargin = 0,
+    KDCoordinate leftMargin = 0);
   int selectedRow();
   int selectedColumn();
   virtual bool handleEvent(Ion::Events::Event event) override;