Virgil Kenny lock-fix6624