Fix for #81

And let's see if GitHub handles my pull request correctly this time!