diff --git a/apps/shared/editable_cell_table_view_controller.cpp b/apps/shared/editable_cell_table_view_controller.cpp
index c890503df..0c7c733d7 100644
--- a/apps/shared/editable_cell_table_view_controller.cpp
+++ b/apps/shared/editable_cell_table_view_controller.cpp
@@ -18,7 +18,7 @@ bool EditableCellTableViewController::textFieldDidFinishEditing(TextField * text
   AppsContainer * appsContainer = ((TextFieldDelegateApp *)app())->container();
   Context * globalContext = appsContainer->globalContext();
   float floatBody = Expression::parse(text)->approximate(*globalContext);
-  if (isnan(floatBody)) {
+  if (isnan(floatBody) || isinf(floatBody)) {
     app()->displayWarning(I18n::Message::UndefinedValue);
     return false;
   }
diff --git a/poincare/src/complex.cpp b/poincare/src/complex.cpp
index 8665b9af2..e355758a4 100644
--- a/poincare/src/complex.cpp
+++ b/poincare/src/complex.cpp
@@ -6,8 +6,8 @@ extern "C" {
 #include <math.h>
 #include <float.h>
 }
-#include "layout/string_layout.h"
 #include "layout/baseline_relative_layout.h"
+#include "layout/string_layout.h"
 #include <ion.h>
 
 namespace Poincare {