Merge branch 'fix/oddfft'