Mari Olden lock-fix9657