diff --git a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java
index 42dc760e..e789f2a1 100644
--- a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java
+++ b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java
@@ -125,7 +125,7 @@ public E getChangesInstance(Changes changes, ChangeType changeType, String table
     }
 
     try {
-      Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$\\$.*", ""));
+      Class clazz = unProxy(myself.getClass());
       Constructor<E> constructor = actualElementClass.getDeclaredConstructor(clazz, Changes.class);
       instance = constructor.newInstance(myself, nextChanges);
       instance.as(getChangesDescription(changeType, tableName));
diff --git a/src/test/java/org/assertj/db/api/SoftAssertions_Test.java b/src/test/java/org/assertj/db/api/SoftAssertions_Test.java
index b0315e73..83f30e5e 100644
--- a/src/test/java/org/assertj/db/api/SoftAssertions_Test.java
+++ b/src/test/java/org/assertj/db/api/SoftAssertions_Test.java
@@ -104,6 +104,7 @@ public void test_soft_assert_changes() {
     final SoftAssertions softly = new SoftAssertions();
     softly.assertThat(changes).change().column("var1").hasValues(0);
     softly.assertThat(changes).change().rowAtStartPoint().changeOfModification().column("var1").hasValues(0);
+    softly.assertThat(changes).ofModificationOnTable("test").hasNumberOfChanges(1);
 
     assertThat(softly.wasSuccess()).isFalse();
     assertThat(softly.errorsCollected()).hasSize(2);