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

Clean lock map destroy/3.2.3