Minor fix (filter is null)