fixed deferred reference-resolving