cut suffix fix #3