BugFixed:lock misuse