Merge pull request #2661 from DaveMC08/feature/issue_2617

fix issue #2617