- Fix bug-in-waiting when adding more than one TAP event type