Stopped passing events to avoid issues