Issued another pull request to address this