Fixed #246
Merge pull request #247 from lyncodev/fix-246

[3.x] Fixed #246