better suffix handling