Merge pull request #731 from TheBlueMatt/2020-10-fix-big-lock