diff --git a/src/bulgarian/CatBul.gf b/src/bulgarian/CatBul.gf
index 249558d53..223dce911 100644
--- a/src/bulgarian/CatBul.gf
+++ b/src/bulgarian/CatBul.gf
@@ -58,7 +58,7 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,AdV,SC] ** open ResBul, Prelude, P
     Predet = {s : GenNum => Str} ;
     Ord = {s : AForm => Str} ;
     Num = {s : CardForm => Str; nn : NNumber; nonEmpty : Bool} ;
-    Card = {s : CardForm => Str; n : Number} ;
+    Card = {s : CardForm => Str; nn : NNumber} ;
     Quant = {s : Bool => AForm => Str; nonEmpty : Bool; spec : Species; p : Polarity} ;
 
 -- Numeral
diff --git a/src/bulgarian/NounBul.gf b/src/bulgarian/NounBul.gf
index 49d095775..e57de9f15 100644
--- a/src/bulgarian/NounBul.gf
+++ b/src/bulgarian/NounBul.gf
@@ -113,15 +113,15 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
     NumSg = {s = \\_ => []; nn = NNum Sg; nonEmpty = False} ;
     NumPl = {s = \\_ => []; nn = NNum Pl; nonEmpty = False} ;
 
-    NumCard n = {s=n.s; nn=case n.n of {Sg => NNum Sg; Pl => NCountable}; nonEmpty = True} ;
+    NumCard n = {s=n.s; nn=n.nn; nonEmpty = True} ;
 
-    NumDigits n = {s = \\gspec => n.s ! NCard gspec; n = n.n} ;
+    NumDigits n = {s = \\gspec => n.s ! NCard gspec; nn = case n.n of {Sg => NNum Sg; Pl => NCountable}} ;
     OrdDigits n = {s = \\aform => n.s ! NOrd aform} ;
 
-    NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; n = numeral.n; nonEmpty = True} ;
+    NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; nn = case numeral.n of {Sg => NNum Sg; Pl => NCountable}} ;
     OrdNumeral numeral = {s = \\aform => numeral.s ! NOrd aform} ;
     
-    AdNum adn num = {s = \\gspec => adn.s ++ num.s ! gspec; n = num.n; nonEmpty = num.nonEmpty} ;
+    AdNum adn num = {s = \\gspec => adn.s ++ num.s ! gspec; nn = num.nn} ;
 
     OrdSuperl a = {s = \\aform => "най" ++ hyphen ++ a.s ! aform} ;
 
diff --git a/src/bulgarian/SymbolBul.gf b/src/bulgarian/SymbolBul.gf
index 60851a3fd..9e6508882 100644
--- a/src/bulgarian/SymbolBul.gf
+++ b/src/bulgarian/SymbolBul.gf
@@ -29,7 +29,7 @@ lin
 
   SymbS sy = sy ; 
 
-  SymbNum sy = {s = \\_ => sy.s; n = Pl; nonEmpty = True} ;
+  SymbNum sy = {s = \\_ => sy.s; nn = NNum Pl} ;
   SymbOrd sy = {s = \\aform => sy.s ++ "-" ++ 
                                case aform of {
                                  ASg Masc Indef => "ти" ;