Fix bug with filter