Quick fix for filtering