diff --git a/src/malay/CatMay.gf b/src/malay/CatMay.gf
index 3970520c..7f3200d5 100644
--- a/src/malay/CatMay.gf
+++ b/src/malay/CatMay.gf
@@ -23,7 +23,7 @@ concrete CatMay of Cat = CommonX - [IAdv] ** open ResMay, Prelude in {
 -- Constructed in QuestionMay.
 
     QCl = ResMay.Clause ;
-    IComp = SS ;                -- interrogative complement of copula  e.g. "where"
+    IComp = {s: Str} ;                -- interrogative complement of copula  e.g. "where"
     IDet = ResMay.Determiner ;  -- interrogative determiner            e.g. "how many"
     IQuant = ResMay.IQuant ;     -- interrogative quantifier            e.g. "which"
     IP = ResMay.IPhrase ;    -- interrogative pronoun               e.g. "who"
diff --git a/src/malay/QuestionMay.gf b/src/malay/QuestionMay.gf
index f6f545fb..e0d3a149 100644
--- a/src/malay/QuestionMay.gf
+++ b/src/malay/QuestionMay.gf
@@ -59,6 +59,16 @@ lin
     } ;
   } ;
 
+
+  -- : IP -> IComp ;
+  CompIP ip = {s = ip.s ! Bare } ;    -- who (is it)
+
+  -- : IComp -> NP -> QCl ;   -- where is John?
+  QuestIComp icomp np = {
+    pred = \\vf,pol => np.s ! Bare ;
+    subj = icomp.s ;
+  } ;
+
 -- \\vf,pol,posadv =>
   --   {
   --   pred = \\vf,pol => ip.s ++ vp.s ! vf ! pol;
@@ -122,9 +132,6 @@ lin
   -- : IAdv -> IComp ;
   CompIAdv iadv = iadv ;            -- where (is it)
 
-  -- : IP -> IComp ;
-  CompIP ip = {s = ip.s ! Abs} ;    -- who (is it)
-
 
 -- More $IP$, $IDet$, and $IAdv$ are defined in $Structural$.
 
diff --git a/src/malay/unittest/questions.gftest b/src/malay/unittest/questions.gftest
index 6b37f404..afadc31a 100644
--- a/src/malay/unittest/questions.gftest
+++ b/src/malay/unittest/questions.gftest
@@ -38,7 +38,6 @@ Lang: UseQCl (TTAnt TPast ASimul) PNeg (QuestIAdv why_IAdv (PredVP (UsePron youS
 LangEng: why didn't you go
 LangMay: mengapa awak tidak pergi
 
--- With ComplSlash: Wh-word is the object
 Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestSlash (IdetCN (IdetQuant which_IQuant NumSg) (UseN woman_N)) (SlashVP (UsePron youSg_Pron) (SlashV2a see_V2)))
 LangEng: which woman did you see
 LangMay : awak melihat perempuan yang mana
@@ -51,3 +50,7 @@ LangMay : awak melihat perempuan yang mana
 Lang: UseQCl (TTAnt TPres ASimul) PPos (QuestVP whoSg_IP (ComplVV want_VV (UseV go_V)))
 LangEng: who wants to go
 LangMay: siapa mahu pergi
+
+Lang: UseQCl (TTAnt TPres ASimul) PPos (QuestIComp (CompIP whoSg_IP) (DetCN (DetQuant DefArt NumSg) (UseN cat_N)))
+LangEng: who is the cat
+LangMay: siapa kucing
\ No newline at end of file