I think this modification is out of this pull request.
Could you please send another one for it?