diff --git a/xtevent/_eventiv.ado b/xtevent/_eventiv.ado
index eaecfea..a522509 100644
--- a/xtevent/_eventiv.ado
+++ b/xtevent/_eventiv.ado
@@ -339,10 +339,10 @@ program define _eventiv, rclass
 		foreach var of varlist `kvstub'* {	
 			if `norm' < 0 loc kvomit = "m`=abs(`norm')'"
 			else loc kvomit "p`=abs(`norm')'"
-			if "`var'"=="`kvstub'_evtime" | "`var'" == "`kvstub'_eq_`kvomit'" continue	
+			if "`var'"=="`kvstub'_evtime" continue	
 			if "`kvstub'"!="_k" {
 				loc sub : subinstr local var "`kvstub'" "_k", all
-				clonevar `sub' = `var'
+				qui clonevar `sub' = `var'
 			}
 			else {
 				loc sub = "`var'"
@@ -354,7 +354,10 @@ program define _eventiv, rclass
 			loc ++ j			
 		}		
 		loc komittrend=r(komittrend)
-		if "`komittrend'"=="." loc komittrend = ""	
+		if "`komittrend'"=="." loc komittrend = ""
+		loc remove "_k_eq_`kvomit'"
+		loc included : list local included - remove
+		loc names : subinstr local names `""_k_eq_`kvomit'".."' ""
 	}		
 	*"
 	loc komit "`norm' `komittrend'"
diff --git a/xtevent/_eventols.ado b/xtevent/_eventols.ado
index 6fa1e4a..b0b2075 100644
--- a/xtevent/_eventols.ado
+++ b/xtevent/_eventols.ado
@@ -227,7 +227,7 @@ program define _eventols, rclass
 		foreach var of varlist `kvstub'* {	
 			if `norm' < 0 loc kvomit = "m`=abs(`norm')'"
 			else loc kvomit "p`=abs(`norm')'"
-			if "`var'"=="`kvstub'_evtime" | "`var'" == "`kvstub'_eq_`kvomit'" continue	
+			if "`var'"=="`kvstub'_evtime" continue	
 			if "`kvstub'"!="_k" {
 				loc sub : subinstr local var "`kvstub'" "_k", all
 				qui clonevar `sub' = `var'
@@ -240,7 +240,10 @@ program define _eventols, rclass
 			* "
 			loc included "`included' `sub'"
 			loc ++ j			
-		}		
+		}
+		loc remove "_k_eq_`kvomit'"
+		loc included : list local included - remove
+		loc names : subinstr local names `""_k_eq_`kvomit'".."' ""
 	}	
 	loc komit "`norm'`komittrend'"
 	loc komit = strtrim("`komit'")