fix immediate resolution bug