one more ordering issue, but all tests pass locally