Corrected a bug and added a real EventMatcher.