Fix suffix bug