fixes #2582
to not change current behavior
Merge pull request #2583 from gurbuzali/clean-lock-map-destroy/3.3

fixes #2582