diff --git a/src/TensorFlowNET.Core/Graphs/Graph.cs b/src/TensorFlowNET.Core/Graphs/Graph.cs
index 29514cd0..767e23f7 100644
--- a/src/TensorFlowNET.Core/Graphs/Graph.cs
+++ b/src/TensorFlowNET.Core/Graphs/Graph.cs
@@ -424,18 +424,23 @@ namespace Tensorflow
             return get_collection<object>(name, scope);
         }
 
-        private IEnumerable<object> findObjects(string name, string scope)
+
+        public List<T> get_collection<T>(string name, string scope = null)
         {
-            return (from c in _collections where c.name == name && (scope == null || c.scope == scope) select c.item);
+
+            return (from c in _collections
+                    where c.name == name && 
+                        (scope == null || c.scope == scope) &&
+                        implementationOf<T>(c.item)
+                    select (T)(c.item)).ToList();
+
+        }
+
+        private static bool implementationOf<T>(object item)
+        {
+            return (item.GetType() == typeof(T) || item.GetType().IsSubclassOf(typeof(T)));
         }
 
-        public List<T> get_collection<T>(string name, string scope = null)
-        {
-           
-           return (from c in findObjects(name, scope) where c.GetType().IsSubclassOf(typeof(T)) select (T)c).ToList();
-                   
-        }
-
         public List<T> get_collection_ref<T>(string name)
         {
             return get_collection<T>(name);
diff --git a/src/TensorFlowNET.Core/Variables/variable_scope.py.cs b/src/TensorFlowNET.Core/Variables/variable_scope.py.cs
index b43663c0..fedb1a27 100644
--- a/src/TensorFlowNET.Core/Variables/variable_scope.py.cs
+++ b/src/TensorFlowNET.Core/Variables/variable_scope.py.cs
@@ -229,8 +229,6 @@ namespace Tensorflow
             return get_variable_scope_store().current_scope;
         }
 
-
-        // TODO: Misses RefVariable as possible value type?
         public static _VariableScopeStore get_variable_scope_store()
         {
             var scope_store = ops.get_collection<_VariableScopeStore>(_VARSCOPESTORE_KEY).FirstOrDefault();