fix delayed resolving