fix for filtering issue