Clemmie Delancey lock-fix1117