Refs 2119: correct resolve order