Fix loading order error