Adjust budle order to prevent #1924