Fix #386
Merge pull request #1019 from stevenmg/patch-4

Fix #386