Get unlocking to work with clusters