diff --git a/lib/src/afrikaans/NumeralAfr.gf b/lib/src/afrikaans/NumeralAfr.gf
index f257be4dc..e4aca3883 100644
--- a/lib/src/afrikaans/NumeralAfr.gf
+++ b/lib/src/afrikaans/NumeralAfr.gf
@@ -1,5 +1,5 @@
 
-concrete NumeralAfr of Numeral = CatAfr ** open ResAfr, Prelude in {
+concrete NumeralAfr of Numeral = CatAfr [Numeral,Digits] ** open ResAfr, Prelude in {
 
 flags optimize = all_subs ;
   coding=utf8 ;
diff --git a/lib/src/amharic/NumeralAmh.gf b/lib/src/amharic/NumeralAmh.gf
index c0d8abfb9..79cad2e3a 100644
--- a/lib/src/amharic/NumeralAmh.gf
+++ b/lib/src/amharic/NumeralAmh.gf
@@ -1,5 +1,5 @@
 
-concrete NumeralAmh of Numeral = CatAmh ** open ResAmh,ParamX,Prelude in {
+concrete NumeralAmh of Numeral = CatAmh [Numeral,Digits] ** open ResAmh,ParamX,Prelude in {
 flags coding = utf8;
 lincat 
 
diff --git a/lib/src/arabic/NumeralAra.gf b/lib/src/arabic/NumeralAra.gf
index daf799a87..c2e7df741 100644
--- a/lib/src/arabic/NumeralAra.gf
+++ b/lib/src/arabic/NumeralAra.gf
@@ -1,4 +1,4 @@
-concrete NumeralAra of Numeral = CatAra ** 
+concrete NumeralAra of Numeral = CatAra [Numeral,Digits] **
   open Predef, Prelude, ResAra, MorphoAra in {
 
 flags coding=utf8 ;
diff --git a/lib/src/bulgarian/NumeralBul.gf b/lib/src/bulgarian/NumeralBul.gf
index 355fa8c88..0091426af 100644
--- a/lib/src/bulgarian/NumeralBul.gf
+++ b/lib/src/bulgarian/NumeralBul.gf
@@ -1,5 +1,5 @@
 --# -coding=cp1251
-concrete NumeralBul of Numeral = CatBul ** open Prelude, ResBul in {
+concrete NumeralBul of Numeral = CatBul [Numeral,Digits] ** open Prelude, ResBul in {
   flags coding=cp1251 ;
 
 
diff --git a/lib/src/chinese/NumeralChi.gf b/lib/src/chinese/NumeralChi.gf
index 05704a023..4ac534b92 100644
--- a/lib/src/chinese/NumeralChi.gf
+++ b/lib/src/chinese/NumeralChi.gf
@@ -1,4 +1,4 @@
-concrete NumeralChi of Numeral = CatChi ** open ResChi, Prelude in {
+concrete NumeralChi of Numeral = CatChi [Numeral,Digits] ** open ResChi, Prelude in {
 
 flags coding = utf8 ;
 
diff --git a/lib/src/danish/NumeralDan.gf b/lib/src/danish/NumeralDan.gf
index 769c000b8..3e8a84f28 100644
--- a/lib/src/danish/NumeralDan.gf
+++ b/lib/src/danish/NumeralDan.gf
@@ -1,4 +1,4 @@
-concrete NumeralDan of Numeral = CatDan ** open MorphoDan,Prelude in {
+concrete NumeralDan of Numeral = CatDan [Numeral,Digits] ** open MorphoDan,Prelude in {
   flags coding=utf8 ;
 
 
diff --git a/lib/src/greek/NumeralGre.gf b/lib/src/greek/NumeralGre.gf
index b20d97a31..6473c1f63 100644
--- a/lib/src/greek/NumeralGre.gf
+++ b/lib/src/greek/NumeralGre.gf
@@ -1,4 +1,4 @@
-concrete NumeralGre of Numeral = CatGre  ** open ResGre,Prelude in {
+concrete NumeralGre of Numeral = CatGre [Numeral,Digits] ** open ResGre,Prelude in {
 
  flags coding= utf8 ;
 
diff --git a/lib/src/hindi/NumeralHin.gf b/lib/src/hindi/NumeralHin.gf
index ac1abdf73..4818d26a9 100644
--- a/lib/src/hindi/NumeralHin.gf
+++ b/lib/src/hindi/NumeralHin.gf
@@ -2,7 +2,7 @@
 -- Modification for Urdu Shafqat Virk
 
 
-concrete NumeralHin of Numeral = CatHin ** open ResHin,CommonHindustani,ParamX, Prelude in {
+concrete NumeralHin of Numeral = CatHin [Numeral,Digits] ** open ResHin,CommonHindustani,ParamX, Prelude in {
 flags coding=utf8 ;
 
 param DForm = unit | ten ;
diff --git a/lib/src/interlingua/NumeralIna.gf b/lib/src/interlingua/NumeralIna.gf
index 6d03107b2..dbec5cf30 100644
--- a/lib/src/interlingua/NumeralIna.gf
+++ b/lib/src/interlingua/NumeralIna.gf
@@ -1,4 +1,4 @@
-concrete NumeralIna of Numeral = CatIna ** open ResIna,Prelude in {
+concrete NumeralIna of Numeral = CatIna [Numeral,Digits] ** open ResIna,Prelude in {
 
   lincat 
   Digit = {s : DForm => CardOrd => Str} ;
diff --git a/lib/src/japanese/NumeralJpn.gf b/lib/src/japanese/NumeralJpn.gf
index d4f0cdeec..90ce9a46c 100644
--- a/lib/src/japanese/NumeralJpn.gf
+++ b/lib/src/japanese/NumeralJpn.gf
@@ -1,4 +1,4 @@
-concrete NumeralJpn of Numeral = CatJpn ** open ResJpn, ParadigmsJpn, Prelude in {
+concrete NumeralJpn of Numeral = CatJpn [Numeral,Digits] ** open ResJpn, ParadigmsJpn, Prelude in {
 
 flags coding = utf8 ;
 
diff --git a/lib/src/latin/NumeralLat.gf b/lib/src/latin/NumeralLat.gf
index ca05f7d4c..c0d59a3d0 100644
--- a/lib/src/latin/NumeralLat.gf
+++ b/lib/src/latin/NumeralLat.gf
@@ -1,4 +1,4 @@
-concrete NumeralLat of Numeral = CatLat ** open ResLat,Prelude in {
+concrete NumeralLat of Numeral = CatLat [Numeral,Digits] ** open ResLat,Prelude in {
 --
 --lincat 
 --  Digit = {s : DForm => CardOrd => Str} ;
diff --git a/lib/src/mongolian/NumeralMon.gf b/lib/src/mongolian/NumeralMon.gf
index d6873ce20..2c2d941b7 100644
--- a/lib/src/mongolian/NumeralMon.gf
+++ b/lib/src/mongolian/NumeralMon.gf
@@ -1,6 +1,6 @@
 --# -path=.:../abstract:../common:../prelude
 
-concrete NumeralMon of Numeral = CatMon ** open ResMon, MorphoMon, Prelude in {
+concrete NumeralMon of Numeral = CatMon [Numeral,Digits] ** open ResMon, MorphoMon, Prelude in {
 
  flags  coding=utf8 ;
 
diff --git a/lib/src/nepali/NumeralNep.gf b/lib/src/nepali/NumeralNep.gf
index d42397266..b9778f70b 100644
--- a/lib/src/nepali/NumeralNep.gf
+++ b/lib/src/nepali/NumeralNep.gf
@@ -1,4 +1,4 @@
-concrete NumeralNep of Numeral = CatNep ** open ResNep, Prelude in {
+concrete NumeralNep of Numeral = CatNep [Numeral,Digits] ** open ResNep, Prelude in {
 -- By Harald Hammarstroem
 -- Modification for Nepali by Dinesh Simkhada and Shafqat Virk - 2011
  flags coding=utf8 ;
diff --git a/lib/src/norwegian/NumeralNor.gf b/lib/src/norwegian/NumeralNor.gf
index 910bd3242..4091c3f59 100644
--- a/lib/src/norwegian/NumeralNor.gf
+++ b/lib/src/norwegian/NumeralNor.gf
@@ -1,4 +1,4 @@
-concrete NumeralNor of Numeral = CatNor ** open MorphoNor, Prelude in {
+concrete NumeralNor of Numeral = CatNor [Numeral,Digits] ** open MorphoNor, Prelude in {
   flags coding=utf8 ;
 
 lincat 
diff --git a/lib/src/polish/NumeralPol.gf b/lib/src/polish/NumeralPol.gf
index c2a5bf000..c4766a0db 100644
--- a/lib/src/polish/NumeralPol.gf
+++ b/lib/src/polish/NumeralPol.gf
@@ -2,7 +2,7 @@
 
 -- Adam Slaski, 2009, 2010 <adam.slaski@gmail.com>
 
-concrete NumeralPol of Numeral = CatPol ** open ResPol,Prelude, AdjectiveMorphoPol in {
+concrete NumeralPol of Numeral = CatPol [Numeral,Digits] ** open ResPol,Prelude, AdjectiveMorphoPol in {
 
   flags  coding=utf8 ;
 
diff --git a/lib/src/punjabi/NumeralPnb.gf b/lib/src/punjabi/NumeralPnb.gf
index da1b0f04b..8dcdb71f2 100644
--- a/lib/src/punjabi/NumeralPnb.gf
+++ b/lib/src/punjabi/NumeralPnb.gf
@@ -1,4 +1,4 @@
-concrete NumeralPnb of Numeral = CatPnb ** open ResPnb, Prelude in {
+concrete NumeralPnb of Numeral = CatPnb [Numeral,Digits] ** open ResPnb, Prelude in {
 -- By Harald Hammarstroem
 -- Modification for Punjabi by Shafqat Virk
  flags coding=utf8 ;
diff --git a/lib/src/romanian/NumeralRon.gf b/lib/src/romanian/NumeralRon.gf
index f4299ae83..b0feae9cb 100644
--- a/lib/src/romanian/NumeralRon.gf
+++ b/lib/src/romanian/NumeralRon.gf
@@ -1,4 +1,4 @@
-concrete NumeralRon of Numeral = CatRon ** 
+concrete NumeralRon of Numeral = CatRon [Numeral,Digits] **
   open  MorphoRon, CatRon, Prelude in {
 
 flags coding = utf8 ;
diff --git a/lib/src/russian/NumeralRus.gf b/lib/src/russian/NumeralRus.gf
index 3e1effc07..8fec45eaa 100644
--- a/lib/src/russian/NumeralRus.gf
+++ b/lib/src/russian/NumeralRus.gf
@@ -1,6 +1,6 @@
 --# -path=.:../abstract:../common:../../prelude
 
-concrete NumeralRus of Numeral = CatRus ** open ResRus, Prelude in {
+concrete NumeralRus of Numeral = CatRus [Numeral,Digits] ** open ResRus, Prelude in {
 
 flags  coding=utf8 ;
 
diff --git a/lib/src/sindhi/NumeralSnd.gf b/lib/src/sindhi/NumeralSnd.gf
index c0eca24d8..0a1201a50 100644
--- a/lib/src/sindhi/NumeralSnd.gf
+++ b/lib/src/sindhi/NumeralSnd.gf
@@ -1,4 +1,4 @@
-concrete NumeralSnd of Numeral = CatSnd ** open ResSnd, Prelude in {
+concrete NumeralSnd of Numeral = CatSnd [Numeral,Digits] ** open ResSnd, Prelude in {
 -- By Harald Hammarstroem
 -- Modification for Punjabi by Shafqat Virk
  flags coding=utf8 ;
diff --git a/lib/src/swahili/NumeralSwa.gf b/lib/src/swahili/NumeralSwa.gf
index 8d9d259d1..4641a5173 100644
--- a/lib/src/swahili/NumeralSwa.gf
+++ b/lib/src/swahili/NumeralSwa.gf
@@ -1,4 +1,4 @@
-concrete NumeralSwa of Numeral = CatSwa ** open ResSwa in {
+concrete NumeralSwa of Numeral = CatSwa [Numeral,Digits] ** open ResSwa in {
 
 
 }
diff --git a/lib/src/telugu/NumeralTel.gf b/lib/src/telugu/NumeralTel.gf
index cc243cc77..21510fa65 100644
--- a/lib/src/telugu/NumeralTel.gf
+++ b/lib/src/telugu/NumeralTel.gf
@@ -1,4 +1,4 @@
---concrete NumeralTel of Numeral = CatTel ** open ResTel in {
+--concrete NumeralTel of Numeral = CatTel [Numeral,Digits] ** open ResTel in {
 ----
 ----lincat 
 ----  Digit = {s : DForm => CardOrd => Str} ;
diff --git a/lib/src/thai/NumeralTha.gf b/lib/src/thai/NumeralTha.gf
index 470628688..945110684 100644
--- a/lib/src/thai/NumeralTha.gf
+++ b/lib/src/thai/NumeralTha.gf
@@ -1,4 +1,4 @@
-concrete NumeralTha of Numeral = CatTha ** open ResTha, StringsTha, Prelude in {
+concrete NumeralTha of Numeral = CatTha [Numeral,Digits] ** open ResTha, StringsTha, Prelude in {
 
 flags coding = utf8 ;
 
diff --git a/lib/src/turkish/NumeralTur.gf b/lib/src/turkish/NumeralTur.gf
index a09a7aa99..3f10e5eda 100644
--- a/lib/src/turkish/NumeralTur.gf
+++ b/lib/src/turkish/NumeralTur.gf
@@ -1,6 +1,6 @@
 --# -path=.:../abstract:../common:../../prelude
 
-concrete NumeralTur of Numeral = CatTur ** open Prelude, ResTur, ParadigmsTur in {
+concrete NumeralTur of Numeral = CatTur [Numeral,Digits] ** open Prelude, ResTur, ParadigmsTur in {
 
 flags
   coding = utf8 ;
diff --git a/lib/src/urdu/NumeralUrd.gf b/lib/src/urdu/NumeralUrd.gf
index e7bd2b567..a4e6cfc02 100644
--- a/lib/src/urdu/NumeralUrd.gf
+++ b/lib/src/urdu/NumeralUrd.gf
@@ -2,7 +2,7 @@
 -- Modification for Urdu Shafqat Virk
 
 
-concrete NumeralUrd of Numeral = CatUrd ** open ResUrd,CommonHindustani,ParamX, Prelude in {
+concrete NumeralUrd of Numeral = CatUrd [Numeral,Digits] ** open ResUrd,CommonHindustani,ParamX, Prelude in {
 flags coding=utf8 ;
 
 param DForm = unit | ten ;