Fixed issue with events (again!)