filterFix
Merge branch 'fitlerFix'