#14 Better handling of promise.resolve event(s)