Fixes the filtering problem