Solve bug on Waiting Room and Client