Attempt at fixing unicode problems