Correct lock bug (refs #4118)
Merge pull request #45 from thingthing/1.6-I4118

Correct lock bug (closes #4118)