Merge pull request #1040 from abhik-99/Issue#945