Fix #89
Merge pull request #1001 from stevenmg/patch-2

Fix #89