Fixed suffix bug