Fix Bug 19: Issue 2 with locks not engaging