Fixes #2568. JoinSuffix should not be used here.
Merge pull request #630 from jeffali/fix/2568

Fixes #2568. JoinSuffix should not be used here.