tweak: change loading order