Merge pull request #854 from TheBlueMatt/2021-03-fix-lens