diff --git a/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java b/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java
index 7245cb4228..a7a059023b 100644
--- a/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java
+++ b/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java
@@ -253,17 +253,17 @@ public final class DisputeResult implements Payload {
 
         if (disputeFeePolicy != null && that.disputeFeePolicy != null && disputeFeePolicy.ordinal() != that.disputeFeePolicy.ordinal())
             return false;
-        else if ((disputeFeePolicy == null && that.disputeFeePolicy != null) || disputeFeePolicy != null)
+        else if ((disputeFeePolicy == null && that.disputeFeePolicy != null) || (disputeFeePolicy != null && that.disputeFeePolicy == null))
             return false;
 
         if (reason != null && that.reason != null && reason.ordinal() != that.reason.ordinal())
             return false;
-        else if ((reason == null && that.reason != null) || reason != null)
+        else if ((reason == null && that.reason != null) || (reason != null && that.reason == null))
             return false;
 
         if (winner != null && that.winner != null && winner.ordinal() != that.winner.ordinal())
             return false;
-        else if ((winner == null && that.winner != null) || winner != null)
+        else if ((winner == null && that.winner != null) || (winner != null && that.winner == null))
             return false;
         
         if (summaryNotes != null ? !summaryNotes.equals(that.summaryNotes) : that.summaryNotes != null) return false;
diff --git a/core/src/main/java/io/bitsquare/trade/offer/Offer.java b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
index 2b2a1ddefe..959ce3fd27 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/Offer.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
@@ -505,7 +505,7 @@ public final class Offer implements Priority1StoragePayload, RequiresOwnerIsOnli
 
         if (direction != null && that.direction != null && direction.ordinal() != that.direction.ordinal())
             return false;
-        else if ((direction == null && that.direction != null) || direction != null)
+        else if ((direction == null && that.direction != null) || (direction != null && that.direction == null))
             return false;
 
         if (currencyCode != null ? !currencyCode.equals(that.currencyCode) : that.currencyCode != null) return false;
diff --git a/core/src/main/java/io/bitsquare/trade/statistics/TradeStatistics.java b/core/src/main/java/io/bitsquare/trade/statistics/TradeStatistics.java
index 4efd47392e..240c518aa1 100644
--- a/core/src/main/java/io/bitsquare/trade/statistics/TradeStatistics.java
+++ b/core/src/main/java/io/bitsquare/trade/statistics/TradeStatistics.java
@@ -113,7 +113,7 @@ public final class TradeStatistics implements Priority2StoragePayload, Capabilit
 
         if (direction != null && that.direction != null && direction.ordinal() != that.direction.ordinal())
             return false;
-        else if ((direction == null && that.direction != null) || direction != null)
+        else if ((direction == null && that.direction != null) || (direction != null && that.direction == null))
             return false;
         
         if (paymentMethod != null ? !paymentMethod.equals(that.paymentMethod) : that.paymentMethod != null)