Fixed a botched change from pull request #3