add correct_suffix(), add correct suffix ONLY if it need