fixed #1491
Merge pull request #1495 from barcharcraz/fix1491

fixed #1491