Merge pull request #2657 from DaveMC08/feature/fixes_2637

Fixes Issue #2637