diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java
index 28d6b5c..6d28cbe 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java
@@ -197,8 +197,8 @@
                           info.addOverride(existing);
                           return existing;
                         }
+                        info.addSibling(existing);
                         if (existing.getMethod().getHolder().isInterface() && !info.isAbstract()) {
-                          info.addSibling(existing);
                           existing.addOverride(info);
                           return info;
                         }
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationMultipleInterfacesSameMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationMultipleInterfacesSameMethodTest.java
index fe10b7d..1326b6a 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationMultipleInterfacesSameMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationMultipleInterfacesSameMethodTest.java
@@ -40,8 +40,7 @@
                 inspector
                     .assertHasPolymorphicMethodState(
                         Reference.methodFromMethod(I.class.getDeclaredMethod("m")))
-                    // TODO(b/363492038): J.m is not monomorphic.
-                    .assertHasMonomorphicMethodState(
+                    .assertHasPolymorphicMethodState(
                         Reference.methodFromMethod(J.class.getDeclaredMethod("m")))
                     .apply(ignore -> inspected.set()))
         .enableNoHorizontalClassMergingAnnotations()