Fixed Bug 1024119

Fixed Bug 1024119
Merge pull request #909 from tanay1337/master

Fixed Bug 1024119