Jeffrey Linker lock-fix0585