ISSUE-71 Knock Lock