Charissa McConnel lock-fix8622