diff --git a/app/src/main/java/org/solovyev/android/calculator/NumberBuilder.java b/app/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
index 401dceb0..d37547e0 100644
--- a/app/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
+++ b/app/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
@@ -117,7 +117,12 @@ public class NumberBuilder extends BaseNumberBuilder {
             return 0;
         } else {
             // process current number (and go to the next one)
-            return processNumber(sb);
+            final int offset = processNumber(sb);
+            if (result.type == MathType.numeral_base) {
+                // if current token is numeral base - update current numeral base
+                nb = NumeralBase.getByPrefix(result.match);
+            }
+            return offset;
         }
     }