diff --git a/poincare/src/integer.cpp b/poincare/src/integer.cpp
index 78de87385..0babef6bd 100644
--- a/poincare/src/integer.cpp
+++ b/poincare/src/integer.cpp
@@ -326,7 +326,8 @@ ExpressionLayout * Integer::createLayout() {
   Integer base = Integer(10);
   Division d = Division(*this, base);
   int size = 0;
-  while (!(d.m_remainder == Integer((native_int_t)0))) {
+  while (!(d.m_remainder == Integer((native_int_t)0) &&
+        d.m_quotient == Integer((native_int_t)0))) {
     assert(size<255); //TODO: malloc an extra buffer
     char c = char_from_digit(d.m_remainder.m_digits[0]);
     buffer[size++] = c;