diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
index 0cda88722..3447bf98b 100644
--- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
@@ -338,7 +338,7 @@ public final class AvdManager {
         synchronized (mAllAvdList) {
             if (mBrokenAvdList == null) {
                 ArrayList<AvdInfo> list = new ArrayList<AvdInfo>();
-                for (AvdInfo avd : mBrokenAvdList) {
+                for (AvdInfo avd : mAllAvdList) {
                     if (avd.getStatus() != AvdStatus.OK) {
                         list.add(avd);
                     }