diff --git a/src/Controls/Internal/ItemContainersManager.ts b/src/Controls/Internal/ItemContainersManager.ts
index da92968a..2f4a08c5 100644
--- a/src/Controls/Internal/ItemContainersManager.ts
+++ b/src/Controls/Internal/ItemContainersManager.ts
@@ -128,7 +128,7 @@ module Fayde.Controls.Internal {
                         if (generator.CurrentItem instanceof UIElement)
                             generator.Current = <UIElement>generator.CurrentItem;
                         generator.IsCurrentNew = true;
-                    } else if (cache.length > 0) {
+                    } else if (cache.length > 0  && generator.CurrentItem instanceof UIElement) {
                         generator.Current = cache.pop();
                         generator.IsCurrentNew = true;
                     } else {
@@ -181,4 +181,4 @@ module Fayde.Controls.Internal {
         CurrentItem: any;
         CurrentIndex: number;
     }
-}
\ No newline at end of file
+}