diff --git a/src/malay/LexiconMay.gf b/src/malay/LexiconMay.gf
index ff04ce651..adca31bb0 100644
--- a/src/malay/LexiconMay.gf
+++ b/src/malay/LexiconMay.gf
@@ -407,7 +407,7 @@ lin walk_V = mkV "jalan" ;
 -- lin warm_A = mkA "" ;
 -- lin wash_V2 = mkV2 "" ;
 -- lin watch_V2 = mkV2 "" ;
--- lin water_N = mkNoun "" ;
+lin water_N = mkN "air" ;
 -- lin wet_A = mkA "" ;
 -- lin white_A = mkA "" ;
 -- lin wide_A = mkA "" ;
diff --git a/src/malay/ParadigmsMay.gf b/src/malay/ParadigmsMay.gf
index c59f23cee..2b2094421 100644
--- a/src/malay/ParadigmsMay.gf
+++ b/src/malay/ParadigmsMay.gf
@@ -133,9 +133,9 @@ oper
     } ;
 
   mkA2 = overload {
-    mkA2 : (adj : Str) -> A = \s -> lin A2 (mkAdj s) ;
+    mkA2 : (adj : Str) -> A2 = \s -> lin A2 ((mkAdj s) ** {c2 = emptyPrep}) ;
     mkA2 : A -> A2 = \a -> lin A2 (a ** {c2 = emptyPrep}) ;
-    mkA2 : A -> Prep -> A = \a,p -> lin A2 (a) ;
+    mkA2 : A -> Prep -> A2 = \a,p -> lin A2 (a ** {c2 = p}) ;
     } ;
 
   mkV = overload {