1 files changed, 4 insertions, 6 deletions

diff --git a/ex1/src/main/java/reflection/api/ReflectionInvestigator.java b/ex1/src/main/java/reflection/api/ReflectionInvestigator.java
index e16d3d5..16fafc1 100644
--- a/ex1/src/main/java/reflection/api/ReflectionInvestigator.java
+++ b/ex1/src/main/java/reflection/api/ReflectionInvestigator.java
@@ -78,9 +78,7 @@ public class ReflectionInvestigator implements Investigator {
     var cursor = classInfo;
     while (cursor != null) {
       fields.addAll(
-          Stream.of(classInfo.getDeclaredFields())
-              .map(f -> f.getName())
-              .collect(Collectors.toSet()));
+          Stream.of(cursor.getDeclaredFields()).map(f -> f.getName()).collect(Collectors.toSet()));
       cursor = cursor.getSuperclass();
     }
     return fields;
@@ -127,12 +125,12 @@ public class ReflectionInvestigator implements Investigator {
   @Override
   public String getInheritanceChain(String delimiter) {
     var nameStack = new HashSet<String>();
-    nameStack.add(classInfo.getSimpleName());
     var cursor = classInfo;
-    while (cursor != null) {
+    do {
       nameStack.add(cursor.getSimpleName());
       cursor = cursor.getSuperclass();
-    }
+    } while (cursor != null);
+
     return String.join(" >> ", nameStack);
   }
 }