Merge pull request #1234 from little-cui/bug

Refactor: use dlock instead