Fix #388
Merge pull request #1116 from stevenmg/patch-12

Fix #388