Finally fix encoding errors