diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index f09b6e2..2278a95 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -1,7 +1,9 @@
 # Call proprietary blob setup
-ifneq ($(filter $(TARGET_DEVICE), a20 a20e),)
+ifneq ($(findstring a20, $(TARGET_PRODUCT)),)
 $(call inherit-product, vendor/samsung/universal7885-common/universal7885-common-vendor.mk)
-else ifneq ($(filter $(TARGET_DEVICE), a30 a40),)
+else ifneq ($(findstring a30, $(TARGET_PRODUCT)),)
+$(call inherit-product, vendor/samsung/universal7904-common/universal7904-common-vendor.mk)
+else ifneq ($(findstring a40, $(TARGET_PRODUCT)),)
 $(call inherit-product, vendor/samsung/universal7904-common/universal7904-common-vendor.mk)
 endif