Fix in filtering