Fix order type mess