add suffixes from #19