Susan Dodds lock-fix1676