fixed more encoding..