Fixed issue with resolveAll