I would like to address this issue in another pull request. Is it ok for you?