Reference to the pull request 2410.

The rewrites and the definition could be considered.Thanks.