Adds suffixes

I should've caught this pre-merging.  My bad.
Merge pull request #5777 from KA101/fix-sugar-crash

Adds suffixes