Merge pull request #911 from TheBlueMatt/2021-05-fix-cltv-diff