Merge pull request #63 from arik-so/2023/10/ordering_fix