diff --git a/src/main/java/github/weichware10/util/data/TrialData.java b/src/main/java/github/weichware10/util/data/TrialData.java
index c4ebb4e..e20e958 100644
--- a/src/main/java/github/weichware10/util/data/TrialData.java
+++ b/src/main/java/github/weichware10/util/data/TrialData.java
@@ -238,8 +238,11 @@ public boolean equals(Object other) {
             return false;
         }
         TrialData that = (TrialData) (other);
-        return toolType.equals(that.toolType) && trialId.equals(that.trialId)
-                && configId.equals(that.configId) && startTime.equals(that.startTime)
-                && answer.equals(that.answer) && dataPoints.equals(that.dataPoints);
+        return toolType.equals(that.toolType)
+                && (trialId == that.trialId || trialId.equals(that.trialId))
+                && (configId == that.configId || configId.equals(that.configId))
+                && startTime.equals(that.startTime)
+                && (answer == that.answer || answer.equals(that.answer))
+                && dataPoints.equals(that.dataPoints);
     }
 }