stage: fix for re-lock