Possibly fix filtering issue