Quick little bug fix on EventApi