fix assign order