Filter bug fix