Fixing the waiting room