diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 4e15a43c2..49cd4357a 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -539,8 +539,7 @@ class DataSmart(MutableMapping):
         return var in self.overridedata
 
     def setVar(self, var, value, **loginfo):
-
-        if not var.startswith("__anon_") and ("_append" in var or "_prepend" in var or "_remove" in var):
+        if not var.startswith("__anon_") and re.search(r"(_append|_prepend|_remove)(_|$)", var):
             info = "%s" % var
             if "file" in loginfo:
                 info += " file: %s" % loginfo["file"]