Fix event notification