fixing events finally