DeferredEvent fix