Fix to filtering
3.2.1