company suffix bug fix