bit of fixing of events