Fixed post-merging errors from pull request #38.