Fixed Bug 1101499
Merge pull request #1012 from tanay1337/master

Fixed Bug 1101499