diff --git a/src/bulgarian/ParadigmsBul.gf b/src/bulgarian/ParadigmsBul.gf
index a430db951..f604e85d9 100644
--- a/src/bulgarian/ParadigmsBul.gf
+++ b/src/bulgarian/ParadigmsBul.gf
@@ -58,11 +58,15 @@ oper
   mkN003 base = let v0 = tk 3 base;
                     v1 = last (base);
                     g  = AMasc NonHuman
-                in {s = mkNoun (v0+"ръ"+v1)
-                               (v0+"ър"+v1+"ове")
-                               (v0+"ър"+v1+"а")
-                               (v0+"ръ"+v1)
-                               g ;
+                in {s = table {
+                          NF Sg Indef => v0+"ръ"+v1 ;
+                          NF Sg Def   => v0+"ър"+v1+"а" ;
+                          NF Pl Indef => v0+"ър"+v1+"ове" ;
+                          NF Pl Def   => v0+"ър"+v1+"овете" ;
+                          NFSgDefNom  => v0+"ър"+v1+"ът" ;
+                          NFPlCount   => v0+"ър"+v1+"ове" ;
+                          NFVocative  => v0+"ръ"+v1
+                        } ;
                     rel = \\_ => base ; relPost = False ;
                     g   = g ;
                     lock_N = <>