Fix #162
Second attempt Fix #162
Merge pull request #163 from hyperunknown/patch-162

Fix #162