Change HandledEventArgs to EventArgs