Waiting Room: Fix Case Matching