CompositeFilter fix (read comment below)