fixing encoding issues