diff --git a/infer/src/pulse/PulseAbductiveDomain.ml b/infer/src/pulse/PulseAbductiveDomain.ml
index 5a04e84e7..2d401920c 100644
--- a/infer/src/pulse/PulseAbductiveDomain.ml
+++ b/infer/src/pulse/PulseAbductiveDomain.ml
@@ -817,27 +817,24 @@ module PrePost = struct
       BaseMemory.add addr_caller edges_post_caller heap
     in
     let attrs =
-      let written_to =
-        let written_to_callee_opt =
-          let open IOption.Let_syntax in
-          let* attrs = BaseAddressAttributes.find_opt addr_caller attrs in
-          Attributes.get_written_to attrs
-        in
-        let callee_trace =
-          match written_to_callee_opt with
-          | None ->
-              Trace.Immediate {location= call_loc; history= []}
-          | Some access_trace ->
-              access_trace
-        in
-        Attribute.WrittenTo
-          (ViaCall
-             { in_call= callee_trace
-             ; f= Call callee_proc_name
-             ; location= call_loc
-             ; history= hist_caller })
+      let written_to_callee_opt =
+        let open IOption.Let_syntax in
+        let* attrs = BaseAddressAttributes.find_opt addr_caller attrs in
+        Attributes.get_written_to attrs
       in
-      BaseAddressAttributes.add_one addr_caller written_to attrs
+      match written_to_callee_opt with
+      | None ->
+          attrs
+      | Some callee_trace ->
+          let written_to =
+            Attribute.WrittenTo
+              (ViaCall
+                 { in_call= callee_trace
+                 ; f= Call callee_proc_name
+                 ; location= call_loc
+                 ; history= hist_caller })
+          in
+          BaseAddressAttributes.add_one addr_caller written_to attrs
     in
     let caller_post = Domain.update ~heap ~attrs call_state.astate.post in
     {call_state with subst; astate= {call_state.astate with post= caller_post}}
diff --git a/infer/tests/codetoanalyze/cpp/impurity/issues.exp b/infer/tests/codetoanalyze/cpp/impurity/issues.exp
index b1646de4f..89838c79a 100644
--- a/infer/tests/codetoanalyze/cpp/impurity/issues.exp
+++ b/infer/tests/codetoanalyze/cpp/impurity/issues.exp
@@ -1,7 +1,5 @@
 ../../facebook-clang-plugins/clang/install/include/c++/v1/iterator, std::__wrap_iter<A*>::operator++, 0, IMPURE_FUNCTION, no_bucket, ERROR, [Impure function std::__wrap_iter<A*>::operator++,parameter `this` modified here]
 ../../facebook-clang-plugins/clang/install/include/c++/v1/iterator, std::__wrap_iter<int*>::operator++, 0, IMPURE_FUNCTION, no_bucket, ERROR, [Impure function std::__wrap_iter<int*>::operator++,parameter `this` modified here]
-../../facebook-clang-plugins/clang/install/include/c++/v1/iterator, std::operator!=<A_*>, 0, IMPURE_FUNCTION, no_bucket, ERROR, [Impure function std::operator!=<A_*>,when calling `std::operator==<A_*,_A_*>` here,parameter `__x` modified here,when calling `std::operator==<A_*,_A_*>` here,parameter `__y` modified here]
-../../facebook-clang-plugins/clang/install/include/c++/v1/iterator, std::operator!=<int_*>, 0, IMPURE_FUNCTION, no_bucket, ERROR, [Impure function std::operator!=<int_*>,when calling `std::operator==<int_*,_int_*>` here,parameter `__x` modified here,when calling `std::operator==<int_*,_int_*>` here,parameter `__y` modified here]
 codetoanalyze/cpp/impurity/array_test.cpp, alias_mod_impure, 0, IMPURE_FUNCTION, no_bucket, ERROR, [Impure function alias_mod_impure,parameter `array` modified here]
 codetoanalyze/cpp/impurity/array_test.cpp, array_mod_both_impure, 0, IMPURE_FUNCTION, no_bucket, ERROR, [Impure function array_mod_both_impure,parameter `a` modified here]
 codetoanalyze/cpp/impurity/array_test.cpp, array_mod_impure, 0, IMPURE_FUNCTION, no_bucket, ERROR, [Impure function array_mod_impure,parameter `b` modified here,parameter `a` modified here]
diff --git a/infer/tests/codetoanalyze/cpp/impurity/struct_test.cpp b/infer/tests/codetoanalyze/cpp/impurity/struct_test.cpp
new file mode 100644
index 000000000..463b067a2
--- /dev/null
+++ b/infer/tests/codetoanalyze/cpp/impurity/struct_test.cpp
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+struct Foo {
+  int x;
+
+  bool operator<(const Foo& rhs) const { return x < rhs.x; }
+};
+
+void call_lt_pure(Foo& lhs, Foo& rhs) { lhs < rhs; }
diff --git a/infer/tests/codetoanalyze/java/impurity/Localities.java b/infer/tests/codetoanalyze/java/impurity/Localities.java
index 0714902d1..5212c5888 100644
--- a/infer/tests/codetoanalyze/java/impurity/Localities.java
+++ b/infer/tests/codetoanalyze/java/impurity/Localities.java
@@ -174,4 +174,12 @@ class Localities {
     Foo first = get_first_pure(list);
     first.inc_impure();
   }
+
+  public static boolean is_null_pure(Byte a) {
+    return a == null;
+  }
+
+  public static boolean call_is_null_pure(Byte a) {
+    return is_null_pure(a);
+  }
 }