Can anyone confirm the episode order on the Australian DVD releases? I'm really hoping they are in the correct episode order.

I have been buying the DVD releases from Shout Factory in the USA, but looks like the next DVD volume has the episodes completely out of order (17, 19, 22, 23 24). Which is really disappointing, considering past DVD volumes were almost in perfect episode order.