This should have been submitted as a separate pull request