Better UTF-8 handling (for Jan)