Fix for FFT matching subsets