fixed #1355
Merge pull request #1357 from devkont/master

fixed #1355