diff --git a/DMBS/core.mk b/DMBS/core.mk
index aade295..18c8d07 100644
--- a/DMBS/core.mk
+++ b/DMBS/core.mk
@@ -1,5 +1,5 @@
 # Include Guard
-ifeq ($(findstring CORE, $(DMBS_BUILD_MODULES)),)
+ifeq ($(filter CORE, $(DMBS_BUILD_MODULES)),)
 
 #
 #            DMBS Build System
diff --git a/Template/lib/TEMPLATE_LIB/TEMPLATE_LIB.mk b/Template/lib/TEMPLATE_LIB/TEMPLATE_LIB.mk
index 84ef669..c74b05f 100644
--- a/Template/lib/TEMPLATE_LIB/TEMPLATE_LIB.mk
+++ b/Template/lib/TEMPLATE_LIB/TEMPLATE_LIB.mk
@@ -7,7 +7,7 @@
 #
 
 # Include Guard
-ifeq ($(findstring TEMPLATE_LIB, $(DMBS_BUILD_MODULES)),)
+ifeq ($(filter TEMPLATE_LIB, $(DMBS_BUILD_MODULES)),)
 
 # Sanity check user supplied DMBS path
 ifndef DMBS_PATH