Fixed a bug after testing in CompositeFilter
Merge remote-tracking branch 'origin/master'