Sync the pull request #28