diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index d5113102b8..f1a6951cd6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -531,7 +531,7 @@ abstract class AbstractRecord extends AbstractStore implements Record {
                     boolean isKeySet = true;
 
                     for (Field<?> field : key.getFields()) {
-                        isKeySet &= (field(field) != null);
+                        isKeySet = isKeySet && (field(field) != null);
                     }
 
                     if (isKeySet) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Value.java b/jOOQ/src/main/java/org/jooq/impl/Value.java
index 1f20b45f5a..0886a5382e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Value.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Value.java
@@ -100,10 +100,10 @@ class Value<T> implements Serializable {
 
             // [#945] Be sure that isChanged is never reset to false
             if (value == null) {
-                isChanged |= val != null;
+                isChanged = isChanged || (val != null);
             }
             else {
-                isChanged |= !value.equals(val);
+                isChanged = isChanged || (!value.equals(val));
             }
         }