fix issuess #160
Merge pull request #247 from 1989car/master

try to fix issuess #160