afterResolveOf advice added