diff --git a/ATMobileAnalytics/Tracker/build.gradle b/ATMobileAnalytics/Tracker/build.gradle
index f9434508..9e451b4d 100644
--- a/ATMobileAnalytics/Tracker/build.gradle
+++ b/ATMobileAnalytics/Tracker/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'jacoco'
 apply from: './publish-mavencentral.gradle'
 
 group = 'com.atinternet'
-version = '2.21.1'
+version = '2.21.2'
 
 android {
     compileSdkVersion 30
diff --git a/ATMobileAnalytics/Tracker/publish-mavencentral.gradle b/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
index 5a7821d7..af4b8913 100644
--- a/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
+++ b/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
@@ -15,7 +15,7 @@ publishing {
         release(MavenPublication) {
             groupId 'com.atinternet'
             artifactId 'Tracker'
-            version '2.21.1'
+            version '2.21.2'
 
             artifact(project.buildDir.absolutePath + "/outputs/aar/${project.getName()}-release.aar")
             artifact androidSourcesJar
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
index 7d3fa00c..a279c200 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
@@ -1061,7 +1061,7 @@ class TechnicalContext {
     static final Closure VTAG = new Closure() {
         @Override
         public String execute() {
-            return "2.21.1";
+            return "2.21.2";
         }
     };
 
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Events.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Events.java
index e3655f7e..d74064c8 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Events.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Events.java
@@ -79,11 +79,9 @@ void setParams() {
 
                 Map<String, Object[]> data = Utility.toFlatten(e.getData(), true, PROPERTY_SEPARATOR);
 
-                if (data.size() != 0) {
-                    eventsArray.put(new JSONObject()
-                            .put("name", e.getName().toLowerCase())
-                            .put("data", new JSONObject(Utility.toObject(data, PROPERTY_SEPARATOR))));
-                }
+                eventsArray.put(new JSONObject()
+                        .put("name", e.getName().toLowerCase())
+                        .put("data", new JSONObject(Utility.toObject(data, PROPERTY_SEPARATOR))));
 
                 List<Event> additionalEvents = e.getAdditionalEvents();
 
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ecommerce/DisplayProduct.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ecommerce/DisplayProduct.java
index 95cc51ec..b670e08f 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ecommerce/DisplayProduct.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ecommerce/DisplayProduct.java
@@ -44,7 +44,10 @@ public List<ECommerceProduct> Products() {
 
     @Override
     protected Map<String, Object> getData() {
-        return data;
+        if (!products.isEmpty()) {
+            data.put("product", products.remove(0).getProps());
+        }
+        return super.getData();
     }
 
     @Override