diff --git a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java
index 4cd8f371c..86df57de6 100644
--- a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java
@@ -18,6 +18,7 @@
  */
 package com.iluwatar.iterator.list;
 
+import com.iluwatar.iterator.Iterator;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,7 +48,7 @@ public class TreasureChest {
     items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
   }
 
-  public TreasureChestItemIterator iterator(ItemType itemType) {
+  public Iterator iterator(ItemType itemType) {
     return new TreasureChestItemIterator(this, itemType);
   }
 
diff --git a/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java b/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java
index af5ba22a4..886c18dd1 100644
--- a/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java
+++ b/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import com.iluwatar.iterator.Iterator;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -62,11 +63,11 @@ public class TreasureChestTest {
   @MethodSource("dataProvider")
   public void testIterator(Item expectedItem) {
     final TreasureChest chest = new TreasureChest();
-    final TreasureChestItemIterator iterator = chest.iterator(expectedItem.getType());
+    final Iterator iterator = chest.iterator(expectedItem.getType());
     assertNotNull(iterator);
 
     while (iterator.hasNext()) {
-      final Item item = iterator.next();
+      final Item item = (Item) iterator.next();
       assertNotNull(item);
       assertEquals(expectedItem.getType(), item.getType());