Fixed more encoding