Merge pull request #2670 from DaveMC08/feature/issue_2667

partial fix #2667