Fix resolveAll