Fixed #1029844
Merge pull request #2259 from anistark/master

Fixed #1029844