Bug fixed about events