Fix Evented bug