Please change it in this PR. I'm okay to append a new commit for that.