Fix bug introduced by #137.
Merge pull request #160 from jharding/137-fix-bug

Fix bug introduced in #137