Bryant Lavallee lock-fix5772