Issue 121

Suggested fix for your pull request.