Lock-Fix lock-fix