Made a change to the event handling to get Undying to work.