Owen Bryant lock-fix2696