Fix load order issue