diff --git a/lib/resource-1.0/finnish/ExtraFin.gf b/lib/resource-1.0/finnish/ExtraFin.gf
index e6b95097d..851080628 100644
--- a/lib/resource-1.0/finnish/ExtraFin.gf
+++ b/lib/resource-1.0/finnish/ExtraFin.gf
@@ -35,7 +35,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin ** open ResFin, MorphoFin, Coordinatio
     i_implicPron = mkPronoun [] "minun" "minua" "minuna" "minuun" Sg P1 ;
     whatPart_IP = {
       s = table {
-        NPCase Nom | NPAcc => "mitä" ;
+        NPCase Nom | NPAcc => "mitä" ;
         c => whatSg_IP.s ! c
         } ;
       n = Sg
diff --git a/src/GF/Compile/Optimize.hs b/src/GF/Compile/Optimize.hs
index 6cbd302f5..61e1615f0 100644
--- a/src/GF/Compile/Optimize.hs
+++ b/src/GF/Compile/Optimize.hs
@@ -167,8 +167,12 @@ partEval opts gr (context, val) trm = errIn ("parteval" +++ prt_ trm) $ do
    etaExpand su t = do
      t' <- comp su t 
      case t' of
-       R _ -> comp su t' --- return t' wo noexpand...
+       R _ | rightType t' -> comp su t' --- return t' wo noexpand...
        _ -> recordExpand val t' >>= comp su
+   -- don't eta expand records of right length (correct by type checking)
+   rightType t = case (t,val) of
+     (R rs, RecType ts) -> length rs == length ts
+     _ -> False
 
    outCase subst t = do
      pts <- getParams context