Fix #167 from War3source
Merge pull request #172 from hitmany/master

Fix #167