Dorris Chiles lock-fix6638