diff --git a/lib/src/finnish/MorphoFin.gf b/lib/src/finnish/MorphoFin.gf
index 3117e8b2b..08c9843e7 100644
--- a/lib/src/finnish/MorphoFin.gf
+++ b/lib/src/finnish/MorphoFin.gf
@@ -966,5 +966,13 @@ oper
       Abess  => "tta"
       } ;
 
+  bindIf : Case -> Str = \c -> case c of {
+    Nom => [] ;
+    _ => BIND
+    } ;
+  bindColonIf : Case -> Str = \c -> case c of {
+    Nom => [] ;
+    _ => BIND ++ ":" ++ BIND
+    } ;
 
 }
diff --git a/lib/src/finnish/SymbolFin.gf b/lib/src/finnish/SymbolFin.gf
index 2409570cf..d3c5d9c4b 100644
--- a/lib/src/finnish/SymbolFin.gf
+++ b/lib/src/finnish/SymbolFin.gf
@@ -3,9 +3,9 @@
 concrete SymbolFin of Symbol = CatFin ** open Prelude, NounFin, ResFin, MorphoFin in {
 
 lin
-  SymbPN i = {s = \\c => i.s ++ BIND ++ defaultCaseEnding c} ; --- c
-  IntPN i  = {s = \\c => i.s ++ BIND ++ ":" ++ BIND ++ defaultCaseEnding c} ; --- c
-  FloatPN i  = {s = \\c => i.s ++ BIND ++ ":" ++ BIND ++ defaultCaseEnding c} ; --- c
+  SymbPN i = {s = \\c => i.s ++ bindIf c ++ defaultCaseEnding c} ; --- c
+  IntPN i  = {s = \\c => i.s ++ bindColonIf c ++ defaultCaseEnding c} ; --- c
+  FloatPN i  = {s = \\c => i.s ++ bindColonIf c ++ defaultCaseEnding c} ; --- c
   NumPN i  = {s = \\c => i.s!Sg!Nom } ; --- c
 
   CNIntNP cn i = {