I have updated the pull request to have same behavior as pecan.