Linq with interface-target cannot query dynamic-component

If target is an interface: Querying a dynamic-component using linq, results in an exception as follows:

System.InvalidCastException : Unable to cast object of type 'NHibernate.Type.ComponentType' to type 'NHibernate.Type.CollectionType'

Example:
var product = (from p in session.Query<IProduct>() where p.Properties["Name"] == "First Product" select p).Single();

See also: https://nhibernate.jira.com/browse/NH-2664

Patch suggestion ist attached.