Fix issue with equivalent suffixes.