Merge branch 'fix/crash_filterbank' (thanks to @niugx)