I think I've fixed the unicode issue..