Fixing Nfilter<5 bug