Fixed unnecessary filtering