bugfix: s/TrimRight/TrimSuffix
for certain cases
#618
Merged
s/TrimRight/TrimSuffix
for certain cases
#618