remove suffix and bug fix