You're right, I can pass another parameter and make unlockCompleted block in this final wait.