Fixed the PIN Event matchers.