Fix Event bug