Merge pull request #808 from TheBlueMatt/2021-02-791-order-fix