Leak with events solved