almost fixed the issue with events