Fix Event Listening