Fixed resolve order