Corrected exit events and stack