Fixed bug event context