(a) Major bug fix for the SystemEventHandler