diff --git a/src/finnish/ExtraFin.gf b/src/finnish/ExtraFin.gf
index dafb3613..78178eae 100644
--- a/src/finnish/ExtraFin.gf
+++ b/src/finnish/ExtraFin.gf
@@ -161,6 +161,9 @@ concrete ExtraFin of ExtraFinAbs = CatFin **
     CompPartAP ap = {
       s = \\agr => ap.s ! False ! NCase (complNumAgr agr) ResFin.Part
       } ;
+    CompNomAP ap = {
+      s = \\agr => ap.s ! False ! NCase (complNumAgr agr) ResFin.Nom
+      } ;
 
 ---- copied from VerbFin.CompAP, should be shared
     ICompAP ap = {
diff --git a/src/finnish/ExtraFinAbs.gf b/src/finnish/ExtraFinAbs.gf
index 7809fdbc..49a77832 100644
--- a/src/finnish/ExtraFinAbs.gf
+++ b/src/finnish/ExtraFinAbs.gf
@@ -28,7 +28,8 @@ abstract ExtraFinAbs = Extra [
 
     vai_Conj : Conj ;                     -- minä vai sinä? ("or" in question)
 
-    CompPartAP : AP -> Comp ;             -- kahvi on valmista
+    CompPartAP : AP -> Comp ;             -- kahvi on valmista: partitive complement also in singular
+    CompNomAP  : AP -> Comp ;             -- kengät ovat mustat: nominative complement also in plural
 
     ProDropPoss : Pron -> Quant ;         -- vaimoni