Merge pull request #2669 from DaveMC08/feature/re_fixes_2637

re-fixes #2637