fix: order inversion issue