diff --git a/src/bases/bases.jl b/src/bases/bases.jl
index 4e3d074..bff2cd6 100644
--- a/src/bases/bases.jl
+++ b/src/bases/bases.jl
@@ -376,10 +376,7 @@ function expand(v)
 end
 
 
-expand(g::Base.Generator{<:Inclusion}) = expand(g.f.(g.iter))
-expand(g::Base.Generator{<:Domain}) = expand(Base.Generator(g.f, Inclusion(g.iter)))
-expand(g::Base.Generator{<:Base.Iterators.ProductIterator{<:Tuple{Vararg{Domain}}}}) = expand(Base.Generator(g.f, ×(g.iter.iterators...)))
-
+expand(g::Base.Generator) = expand(collect(g)) # collect will make a BroadcastQuasiArray
 
 @inline copy(L::Ldiv{<:AbstractBasisLayout}) = basis_ldiv_size(size(L), L.A, L.B)
 @inline copy(L::Ldiv{<:AbstractBasisLayout,<:AbstractLazyLayout}) = basis_ldiv_size(size(L), L.A, L.B)