Fix unicode decode error

@jone Please take a look at my branch...