Fix error with suffixes