Fix redundant symbol and encoding issue