diff --git a/src/somali/CatSom.gf b/src/somali/CatSom.gf
index 5c2936776..4a87768a6 100644
--- a/src/somali/CatSom.gf
+++ b/src/somali/CatSom.gf
@@ -93,18 +93,18 @@ concrete CatSom of Cat = CommonX - [Adv,IAdv] ** open ResSom, Prelude in {
 -- These are constructed in LexiconSom and in
 -- additional lexicon modules.
 
-    V,
     VS,    -- sentence-complement verb            e.g. "claim"
     -- TODO: eventually different lincats
     VQ,    -- question-complement verb            e.g. "wonder"
     VA,    -- adjective-complement verb           e.g. "look"
-    V2V,   -- verb with NP and V complement       e.g. "cause"
-    V2S,   -- verb with NP and S complement       e.g. "tell"
-    V2Q,   -- verb with NP and Q complement       e.g. "ask"
-    V2A = ResSom.Verb ; -- verb with NP and AP complement      e.g. "paint"
+    V = ResSom.Verb ;
 
     VV = ResSom.VV ;    -- verb-phrase-complement verb         e.g. "want"
 
+    V2A,   -- verb with NP and AP complement      e.g. "paint"
+    V2V,   -- verb with NP and V complement       e.g. "cause"
+    V2S,   -- verb with NP and S complement       e.g. "tell"
+    V2Q,   -- verb with NP and Q complement       e.g. "ask"
     V2 = ResSom.Verb2 ;
     V3 = ResSom.Verb3 ;
 
@@ -123,5 +123,5 @@ linref
     -- Cl = linCl ;
     VP = infVP ;
     CN = linCN ;
-    Prep = \prep -> prep.s ! P3_Prep ++ prep.sii ++ prep.dhex ++ prep.miscAdv ! Sg3 Masc ;
+    Prep = \prep -> prep.s ! P3_Prep ++ prep.sii ++ prep.dhex ++ prep.hoostiisa ! Sg3 Masc ;
 }
diff --git a/src/somali/LexiconSom.gf b/src/somali/LexiconSom.gf
index 353b6977f..8e3bf3439 100644
--- a/src/somali/LexiconSom.gf
+++ b/src/somali/LexiconSom.gf
@@ -253,7 +253,7 @@ lin name_N = mkN "magac" ;
 -- lin oil_N = mkN "" ;
 -- lin old_A = mkA "" ;
 -- lin open_V2 = mkV2 "" ;
--- lin paint_V2A = mkV2 "" ;
+lin paint_V2A = mkV2 "rinjiyee" ;
 -- lin paper_N = mkN "" ;
 -- lin paris_PN = mkPN "Paris" ;
 -- lin peace_N = mkN "" ;
diff --git a/src/somali/VerbSom.gf b/src/somali/VerbSom.gf
index 27e87b27f..6ccc5cbf8 100644
--- a/src/somali/VerbSom.gf
+++ b/src/somali/VerbSom.gf
@@ -75,12 +75,13 @@ lin
 
   -- : V2Q -> QS -> VPSlash ;  -- ask (him) who came
   SlashV2Q v2q qs = ;
-
-  -- : V2A -> AP -> VPSlash ;  -- paint (it) red
-  SlashV2A v2a ap = slashDObj v2a **
-    { comp = (CompAP ap).s } ;
-
 -}
+  -- : V2A -> AP -> VPSlash ;  -- paint (it) red
+   -- TODO: is "red" plural in "paint them red"?
+  SlashV2A v2a ap = useVc v2a ** {
+    comp = \\_ => (CompAP ap).comp ! Sg3 Masc
+  } ;
+
   -- : VPSlash -> NP -> VP
   ComplSlash = insertComp ;
 
diff --git a/src/somali/unittest/cl.gftest b/src/somali/unittest/cl.gftest
index 597aa4c79..0e294d26f 100644
--- a/src/somali/unittest/cl.gftest
+++ b/src/somali/unittest/cl.gftest
@@ -85,3 +85,7 @@ Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (RelNP (UseP
 -- LangEng: which cat teaches him
 LangSom: bisad BIND dee baa ku bartaa
 Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestVP (IdetCN (IdetQuant which_IQuant NumSg) (UseN cat_N)) (ComplSlash (SlashV2a teach_V2) (UsePron he_Pron))))) NoVoc
+
+-- LangEng: how does your mother paint the house black
+LangSom: sidee baa ay hooya BIND daa madow u rinjiyeysaa guri BIND ga
+Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestIAdv how_IAdv (PredVP (DetCN (DetQuant (PossPron youSg_Pron) NumSg) (UseN2 mother_N2)) (ComplSlash (SlashV2A paint_V2A (PositA black_A)) (DetCN (DetQuant DefArt NumSg) (UseN house_N))))))) NoVoc