Unlock during trying to get ZK-lock
Merge pull request #862 from rimms/fixed-618

Unlock during trying to get ZK-lock