Zak Wimble lock-fix1071