Fixed: Better checks for enabled field of events.