diff --git a/src/headfirst/designpatterns/composite/menuiterator/Menu.java b/src/headfirst/designpatterns/composite/menuiterator/Menu.java
index 9a07bec0..7fa25407 100755
--- a/src/headfirst/designpatterns/composite/menuiterator/Menu.java
+++ b/src/headfirst/designpatterns/composite/menuiterator/Menu.java
@@ -36,7 +36,7 @@ public String getDescription() {
 
   
 	public Iterator<MenuComponent> createIterator() {
-		if (iterator == null) {
+		if (iterator == null || !iterator.hasNext()) {
 			iterator = new CompositeIterator(menuComponents.iterator());
 		}
 		return iterator;