Jon Applebaum lock-fix2452