revert change to waitingstate case match