fixing suffix preservation