fixed whenResolved