diff --git a/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs b/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs
index bd3627bd08f..30249b118b7 100644
--- a/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs
+++ b/src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs
@@ -7,6 +7,7 @@
 using NHibernate.Linq.Functions;
 using NHibernate.Param;
 using NHibernate.Util;
+using Remotion.Linq;
 using Remotion.Linq.Clauses.Expressions;
 using Remotion.Linq.Clauses.ResultOperators;
 
@@ -387,7 +388,7 @@ protected HqlTreeNode VisitConstantExpression(ConstantExpression expression)
 			{
 				System.Type t = expression.Value.GetType();
 
-				if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof (NhQueryable<>))
+				if (t.IsGenericType && typeof(QueryableBase<>).IsAssignableFrom(t))
 				{
 					return _hqlTreeBuilder.Ident(t.GetGenericArguments()[0].FullName);
 				}
@@ -461,4 +462,4 @@ protected HqlTreeNode VisitNewArrayExpression(NewArrayExpression expression)
 			return _hqlTreeBuilder.ExpressionSubTreeHolder(expressionSubTree);
 		}
 	}
-}
\ No newline at end of file
+}