changed suffix handle