fix order pull request #1733