encoding issue, clean up