Merge pull request #722 from TheBlueMatt/2020-09-broken-fn